Mercurial > hg-stable

changeset 6015:26ef792f834e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: fix path to working file when fixeol is enabled
author Lee Cantey <lcantey@gmail.com>
date Sun, 03 Feb 2008 23:58:02 -0800
parents 2f424fc4edb3
children 288ec2f6faa2
files mercurial/filemerge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)