![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Fredrik Kuivinen <freku045@student.liu.se> | |
| Mon, 12 Sep 2005 21:29:06 +0000 (23:29 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 12 Sep 2005 21:53:55 +0000 (14:53 -0700) | ||
| commit | 8ceba720ba5e5e76384e46629e599124c6f36409 | |
| tree | 433b0b4d8c83bee9cfde856b0765a8b9cba531db | tree | snapshot |
| parent | 540bf654d007b3289adec37e3008c588ba677e25 | commit | 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>
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 |