hgbook: es/examples/issue29 annotate

hgbook

refined chap 2

author	Zhaoping Sun <zhaopingsun@gmail.com>
date	Mon Dec 28 22:58:53 2009 -0500 (2009-12-28)
parents
children

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