Mercurial > hgbook
comparison ja/examples/issue29 @ 290:b0db5adf11c1 ja_root
fork Japanese translation.
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Wed, 06 Feb 2008 17:43:11 +0900 |
parents | en/examples/issue29@91a936be78b8 |
children |
comparison
equal
deleted
inserted
replaced
289:7be02466421b | 290:b0db5adf11c1 |
---|---|
1 #!/bin/bash | |
2 | |
3 #$ name: go | |
4 | |
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 | |
15 | |
16 #$ ignore: abort: Is a directory: .* | |
17 hg merge | |
18 | |
19 #$ name: | |
20 # This error is expected from the failed merge. | |
21 | |
22 exit 0 |