[PATCH] filemerge: fix path to working file when fixeol is enabled

[Lee Cantey]

# HG changeset patch
# User Lee Cantey <lcantey at gmail.com>
# Date 1202111882 28800
# Node ID 6e6716183245829203ce9fa9bf751cd33bd7d8c2
# Parent  bbf99f428bedf315c2a035a6249ac2e45b37d83b
filemerge: fix path to working file when fixeol is enabled

diff -r bbf99f428bed -r 6e6716183245 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Sun Feb 03 23:09:26 2008 -0800
+++ b/mercurial/filemerge.py	Sun Feb 03 23:58:02 2008 -0800
@@ -193,7 +193,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)