Mercurial > hgbook
comparison es/examples/issue29 @ 432:04c08ad7e92e
Translated svgs dummy .tex towards building
author | Igor TAmara <igor@tamarapatino.org> |
---|---|
date | Sat, 18 Oct 2008 07:48:21 -0500 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
431:d13a05515acf | 432:04c08ad7e92e |
---|---|
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 |