Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Mar 2012 17:45:13 +0100] rev 16206
merge with stable
mercurial/filemerge.py in the default branch does not need the additional
unlink calls, because the unlink calls at the end of filemerge.filemerge()
are called for internal:dump, too.