annotate es/examples/issue29 @ 794:41bb6ec2ca27

Propagate c36a6f534b99 Fix named branching book section. 'hg update -C branchname' is no longer required to jump from one named branch to another one; this can also be done simply using 'hg update branchname'.

#!/bin/bash

#$ name: go

hg init issue29
cd issue29
echo a > a
hg ci -Ama
echo b > b
hg ci -Amb
hg up 0
mkdir b
echo b > b/b
hg ci -Amc

#$ ignore: abort: Is a directory: .*
hg merge

#$ name:
# This error is expected from the failed merge.

exit 0