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