Mercurial > hg-stable

changeset 10321:6e721636fede

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with main
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 05 Feb 2010 18:23:01 +0100
parents 86a6bc519592 (current diff) 808c187fc556 (diff)
children d9a2bc2f776b
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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