Hg merge & .orig files

[Gregory Collins]

Hi all,

Something seems to have changed in the behaviour of "hg merge" between
0.9.5 and 1.0 that's breaking the ediff script posted at
http://www.selenic.com/mercurial/wiki/index.cgi/MergingWithEmacs.

I just tried a 3-way merge that broke with a message:

    abort: No such file or directory: /home/greg/.../foo.cpp.orig

It seems like Mercurial itself is trying to delete this file, where the
script was doing it before. Can someone confirm that? I'll update the
wiki page accordingly.

G.