--- a/mercurial/merge.py Thu Jan 24 23:57:44 2013 +0100
+++ b/mercurial/merge.py Mon Feb 04 02:46:38 2013 +0100
@@ -228,10 +228,7 @@
prompts = []
# Compare manifests
- visit = m1.iteritems()
- if repo.ui.debugflag:
- visit = sorted(visit)
- for f, n in visit:
+ for f, n in m1.iteritems():
if partial and not partial(f):
continue
if f in m2:
@@ -271,10 +268,7 @@
else:
act("other deleted", "r", f)
- visit = m2.iteritems()
- if repo.ui.debugflag:
- visit = sorted(visit)
- for f, n in visit:
+ for f, n in m2.iteritems():
if partial and not partial(f):
continue
if f in m1 or f in copied: # files already visited