Mercurial > hg

diff mercurial/filemerge.py @ 6743:86e8187b721a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify flag handling add _checklink var to dirstate introduce dirstate.flagfunc switch users of util.execfunc/linkfunc to flagfunc change manifestdict.set to take a flags string change ctx.fileflags to ctx.flags change gitmode func to a dict remove util.execfunc/linkfunc
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Jun 2008 13:46:34 -0500
parents 65f1b97484be
children d3691d31fc9c
line wrap: on
line diff
--- a/mercurial/filemerge.py	Thu Jun 26 13:46:33 2008 -0500
+++ b/mercurial/filemerge.py	Thu Jun 26 13:46:34 2008 -0500
@@ -146,7 +146,7 @@
     if tool == "internal:local":
         return 0
     if tool == "internal:other":
-        repo.wwrite(fd, fco.data(), fco.fileflags())
+        repo.wwrite(fd, fco.data(), fco.flags())
         return 0
     if tool == "internal:fail":
         return 1