Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 2842: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 b11c014dcbd9
children bee4b7abcb01
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Aug 11 11:00:38 2006 -0500
+++ b/mercurial/merge.py	Mon Aug 14 14:14:08 2006 -0500
@@ -87,7 +87,7 @@
     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)