hgbook
view es/examples/issue29 @ 350:74224b4f6928
this file was a symlink; this was intended to keep track of the file on any
change that might appear on the original version of the book. I removed it and
instead created a copy, because some of the modifications needed for the
translation (the traduction of a couple of commands defined there) would have
affected the english version. And we don't want that ;)
change that might appear on the original version of the book. I removed it and
instead created a copy, because some of the modifications needed for the
translation (the traduction of a couple of commands defined there) would have
affected the english version. And we don't want that ;)
| author | jerojasro@localhost |
|---|---|
| date | Sun Oct 19 23:53:39 2008 -0500 (2008-10-19) |
| parents | |
| children |
line source
1 #!/bin/bash
3 #$ name: go
5 hg init issue29
6 cd issue29
7 echo a > a
8 hg ci -Ama
9 echo b > b
10 hg ci -Amb
11 hg up 0
12 mkdir b
13 echo b > b/b
14 hg ci -Amc
16 #$ ignore: abort: Is a directory: .*
17 hg merge
19 #$ name:
20 # This error is expected from the failed merge.
22 exit 0