--- a/mercurial/filemerge.py Mon Feb 04 09:53:10 2008 -0600
+++ b/mercurial/filemerge.py Sun Feb 03 23:58:02 2008 -0800
@@ -191,7 +191,7 @@
r = 1
if _toolbool(ui, tool, "fixeol"):
- _matcheol(repo.join(fd), back)
+ _matcheol(repo.wjoin(fd), back)
if r:
repo.ui.warn(_("merging %s failed!\n") % fd)