# HG changeset patch # User Lee Cantey <lcantey@gmail.com> # Date 1202111882 28800 # Sun Feb 03 23:58:02 2008 -0800 # Node ID 26ef792f834e1a434179d379a2c4aff7a1219d66 # Parent 2f424fc4edb33c0f7fc27f1e90414aee2b2442f1 filemerge: fix path to working file when fixeol is enabled diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -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)