annotate-blame test: add evil merge.
commitce5b6e711148d035478fcb18773a0abcef302d7e
authorJunio C Hamano <junkio@cox.net>
Mon, 6 Mar 2006 06:37:15 +0000 (5 22:37 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 6 Mar 2006 06:37:15 +0000 (5 22:37 -0800)
tree6273ef26d41612aa47771c6f17e39e44648695a5
parent8ad02bc9649b0a69a0c09a23bd177a070b57af7d
annotate-blame test: add evil merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
t/annotate-tests.sh