Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/filemerge.py
changeset 6743 86e8187b721a
parent 6533 65f1b97484be
child 6744 d3691d31fc9c 
--- 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
mercurial