# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1155582848 18000
# Node ID 06c05c675a3573850cf3b97b9309e339542c48e0
# Parent  e3fb4223e750f06749850a345059b6e821279c35
merge: minor simplification

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- 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)