summaryrefslogtreecommitdiff
path: root/diff-index.c
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-09-12 23:29:06 +0200
committerJunio C Hamano <junkio@cox.net>2005-09-12 14:53:55 -0700
commit8ceba720ba5e5e76384e46629e599124c6f36409 (patch)
tree433b0b4d8c83bee9cfde856b0765a8b9cba531db /diff-index.c
parent540bf654d007b3289adec37e3008c588ba677e25 (diff)
downloadgit-8ceba720ba5e5e76384e46629e599124c6f36409.tar.gz
[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>
Diffstat (limited to 'diff-index.c')
0 files changed, 0 insertions, 0 deletions