igor@333: #!/bin/bash
igor@333: 
igor@333: #$ name: go
igor@333: 
igor@333: hg init issue29
igor@333: cd issue29
igor@333: echo a > a
igor@333: hg ci -Ama
igor@333: echo b > b
igor@333: hg ci -Amb
igor@333: hg up 0
igor@333: mkdir b
igor@333: echo b > b/b
igor@333: hg ci -Amc
igor@333: 
igor@333: #$ ignore: abort: Is a directory: .*
igor@333: hg merge
igor@333: 
igor@333: #$ name:
igor@333: # This error is expected from the failed merge.
igor@333: 
igor@333: exit 0