tests/test-bad-pull.out

filemerge: remove the hgmerge script

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

abort: error: Connection refused
255
copy: No such file or directory
abort: HTTP Error 404
0