--- 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)