hgbook
view en/examples/issue29 @ 674:3b640272a966
Progres on resolve
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Sun Apr 12 00:05:30 2009 -0700 (2009-04-12) |
| 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