##// END OF EJS Templates
merge with stable...
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.
Thomas Arendsen Hein -
r16206:1970e6f6 merge default
Show More