--- a/mercurial/merge.py Sun Sep 17 19:53:19 2006 -0500
+++ b/mercurial/merge.py Sun Sep 17 19:54:01 2006 -0500
@@ -174,8 +174,6 @@
ui.debug(_("working dir created %s, keeping\n") % f)
for f, n in m2.iteritems():
- if f[0] == "/":
- continue
if f in ma and n != ma[f]:
r = _("k")
if not overwrite: