projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 540bf65) | patch
[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)
commit8ceba720ba5e5e76384e46629e599124c6f36409
tree433b0b4d8c83bee9cfde856b0765a8b9cba531dbtree | snapshot
parent540bf654d007b3289adec37e3008c588ba677e25commit | diff
[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>
git-merge-fredrik.py diff | blob | history
The core git plumbing