hgbook

view en/examples/issue29 @ 449:9b3cc9f398f9

find changesets by author, revision, files, or words in the commit message
Finished MQ chapter translation

Added translation term fold
author Igor TAmara <igor@tamarapatino.org>
date Sat Dec 13 12:23:51 2008 -0500 (2008-12-13)
parents
children
line source
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