[PATCH] Fix assertion failure when merging common ancestors.
authorFredrik Kuivinen <freku045@student.liu.se>
Mon, 12 Sep 2005 21:29:06 +0000 (23:29 +0200)
committerJunio C Hamano <junkio@cox.net>
Mon, 12 Sep 2005 21:53:55 +0000 (14:53 -0700)
commit8ceba72...ba5e5e76384e46629e599124c6f36409
tree433b0b4...8c83bee9cfde856b0765a8b9cba531dbcopy hash to clipboard (tree)
parent540bf65...d007b3289adec37e3008c588ba677e25copy hash to clipboard (diff)
git-merge-fredrik.py