diff -r 2d54e7c1e69d -r 86e8187b721a mercurial/filemerge.py
--- 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