hgbook

annotate 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
rev   line source
bos@156 1 #!/bin/bash
bos@156 2
bos@156 3 #$ name: go
bos@156 4
bos@156 5 hg init issue29
bos@156 6 cd issue29
bos@156 7 echo a > a
bos@156 8 hg ci -Ama
bos@156 9 echo b > b
bos@156 10 hg ci -Amb
bos@156 11 hg up 0
bos@156 12 mkdir b
bos@156 13 echo b > b/b
bos@156 14 hg ci -Amc
bos@156 15
bos@156 16 #$ ignore: abort: Is a directory: .*
bos@156 17 hg merge
bos@156 18
bos@156 19 #$ name:
bos@156 20 # This error is expected from the failed merge.
bos@156 21
bos@156 22 exit 0