@matheusbsbs / matheus-bagliano / commits / 8ceba720ba
Fork 0

[PATCH] Fix assertion failure when merging common ancestors.

Bug reported by Junio. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>

Fredrik Kuivinen committed Sep 12, 2005 at 23:29 UTC 8ceba720ba5e5e76384e46629e599124c6f36409
1 file changed +1 -1
git-merge-fredrik.py
+1 -1
@@ -60,7 +60,7 @@ def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0):
60 branch1Name, branch2Name,
61 cleanCache, updateWd)
62
63 - if clean or alwaysWriteTree:
63 + if clean or cleanCache:
64 res = Commit(None, [h1, h2], tree=shaRes)
65 graph.addNode(res)
66 else: