--- a/mercurial/filemerge.py Sat Jun 20 16:42:51 2009 -0500
+++ b/mercurial/filemerge.py Sat Jun 20 16:42:51 2009 -0500
@@ -195,8 +195,8 @@
elif tool == 'internal:dump':
a = repo.wjoin(fd)
util.copyfile(a, a + ".local")
- repo.wwrite(a + ".other", fco.data(), fco.flags())
- repo.wwrite(a + ".base", fca.data(), fca.flags())
+ repo.wwrite(fd + ".other", fco.data(), fco.flags())
+ repo.wwrite(fd + ".base", fca.data(), fca.flags())
return 1 # unresolved
else:
args = _toolstr(ui, tool, "args", '$local $base $other')