Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 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 bb441d77df99
children 288ec2f6faa2
comparison
equal deleted inserted replaced
6014:2f424fc4edb3 6015:26ef792f834e
189 if not r and _toolbool(ui, tool, "checkconflicts"): 189 if not r and _toolbool(ui, tool, "checkconflicts"):
190 if re.match("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcm.data()): 190 if re.match("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcm.data()):
191 r = 1 191 r = 1
192 192
193 if _toolbool(ui, tool, "fixeol"): 193 if _toolbool(ui, tool, "fixeol"):
194 _matcheol(repo.join(fd), back) 194 _matcheol(repo.wjoin(fd), back)
195 195
196 if r: 196 if r:
197 repo.ui.warn(_("merging %s failed!\n") % fd) 197 repo.ui.warn(_("merging %s failed!\n") % fd)
198 else: 198 else:
199 os.unlink(back) 199 os.unlink(back)