hgbook

view es/examples/issue29 @ 374:c2ff82128ac5

Started translating undo.tex , added mistake and rollback
author Igor TAmara <igor@tamarapatino.org>
date Mon Oct 27 13:32:16 2008 -0500 (2008-10-27)
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