Mercurial > hg > mercurial-crew-with-dirclash

changeset 2898:06c05c675a35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: minor simplification
author Matt Mackall <mpm@selenic.com>
date Mon, 14 Aug 2006 14:14:08 -0500
parents e3fb4223e750
children bee4b7abcb01
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -87,7 +87,7 @@ def update(repo, node, branchmerge=False
     m2 = repo.manifest.read(m2n).copy()
     ma = repo.manifest.read(man)
 
-    if not forcemerge and not overwrite:
+    if not force:
         for f in unknown:
             if f in m2:
                 t1 = repo.wread(f)