Mercurial > hg

changeset 2886:bee4b7abcb01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Matt Mackall <mpm@selenic.com>
date Mon, 14 Aug 2006 14:42:15 -0500
parents 06c05c675a35 (diff) bd29a3067b97 (current diff)
children 05257fd28591
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Aug 13 17:03:33 2006 -0700
+++ b/mercurial/merge.py	Mon Aug 14 14:42:15 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)