# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1265390581 -3600
# Node ID 6e721636fede17911a9290fab4a1055d0b8341bd
# Parent  86a6bc519592ea56b0fd042e6ed7b67103c18cab# Parent  808c187fc55684ba9a42797128c34168bb22fd3b
merge with main

diff -r 86a6bc519592 -r 6e721636fede mercurial/localrepo.py
--- a/mercurial/localrepo.py	Mon Feb 01 22:29:11 2010 +0200
+++ b/mercurial/localrepo.py	Fri Feb 05 18:23:01 2010 +0100
@@ -748,7 +748,7 @@
             return flog.add(text, meta, tr, linkrev, fparent1, fparent2)
 
         # are just the flags changed during merge?
-        if fparent1 !=  fparent2o and manifest1.flags(fname) != fctx.flags():
+        if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags():
             changelist.append(fname)
 
         return fparent1