bos@611: <!-- BEGIN issue29.go -->
bos@564: <screen><prompt>$</prompt> <userinput>hg init issue29</userinput>
bos@564: <prompt>$</prompt> <userinput>cd issue29</userinput>
bos@564: <prompt>$</prompt> <userinput>echo a &gt; a</userinput>
bos@564: <prompt>$</prompt> <userinput>hg ci -Ama</userinput>
bos@156: adding a
bos@564: <prompt>$</prompt> <userinput>echo b &gt; b</userinput>
bos@564: <prompt>$</prompt> <userinput>hg ci -Amb</userinput>
bos@156: adding b
bos@564: <prompt>$</prompt> <userinput>hg up 0</userinput>
bos@156: 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
bos@564: <prompt>$</prompt> <userinput>mkdir b</userinput>
bos@564: <prompt>$</prompt> <userinput>echo b &gt; b/b</userinput>
bos@564: <prompt>$</prompt> <userinput>hg ci -Amc</userinput>
bos@156: adding b/b
hg@295: created new head
bos@564: <prompt>$</prompt> <userinput>hg merge</userinput>
bos@156: 
bos@564: </screen>
bos@611: <!-- END issue29.go -->