From: Fredrik Kuivinen Date: Mon, 12 Sep 2005 21:29:06 GMT Subject: [PATCH 1/5] Fix assertion failure when merging common ancestors. Message-ID: <20050912212906.GC6644@c165.ib.student.liu.se> In-Reply-To: <20050912212601.GB6644@c165.ib.student.liu.se> Bug reported by Junio. Signed-off-by: Fredrik Kuivinen --- git-merge-fredrik.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 95251fce0dd6366478e8d51d4f187cb07d662d7a diff --git a/git-merge-fredrik.py b/git-merge-fredrik.py --- a/git-merge-fredrik.py +++ b/git-merge-fredrik.py @@ -60,7 +60,7 @@ def merge(h1, h2, branch1Name, branch2Na branch1Name, branch2Name, cleanCache, updateWd) - if clean or alwaysWriteTree: + if clean or cleanCache: res = Commit(None, [h1, h2], tree=shaRes) graph.addNode(res) else: