changeset 10320 | 808c187fc556 |
parent 10282 | 08a0f04b56bd |
child 10322 | d9a2bc2f776b |
--- 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