--- a/mercurial/merge.py Wed Dec 03 10:56:07 2014 -0800
+++ b/mercurial/merge.py Wed Dec 03 11:02:52 2014 -0800
@@ -475,8 +475,12 @@
pass # we'll deal with it on m1 side
elif f in movewithdir:
f2 = movewithdir[f]
- actions['dg'].append((f2, (f, fl2),
- "local directory rename - get from " + f))
+ if f2 in m1:
+ actions['m'].append((f2, (f2, f, None, False, pa.node()),
+ "local directory rename, both created"))
+ else:
+ actions['dg'].append((f2, (f, fl2),
+ "local directory rename - get from " + f))
elif f in copy:
f2 = copy[f]
if f2 in m2: