tests/test-impexp-branch.out

filemerge: remove the hgmerge script

This is now better handled using [merge-tools] and [merge-patterns] in hgrc.

marked working directory as branch abranch
applying patch from stdin
applying patch from stdin
applying patch from stdin
applying patch from stdin