Mercurial > hg

changeset 10320:808c187fc556

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: minor formatting - remove double space
author Henri Wiechers <hwiechers@gmail.com>
date Fri, 05 Feb 2010 17:02:27 +0200
parents 325a6aa95eea
children 6e721636fede
files mercurial/localrepo.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Fri Feb 05 17:24:38 2010 +0100
+++ b/mercurial/localrepo.py	Fri Feb 05 17:02:27 2010 +0200
@@ -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