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