summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-06 06:37:15 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-06 06:37:15 (GMT)
commitce5b6e711148d035478fcb18773a0abcef302d7e (patch)
tree6273ef26d41612aa47771c6f17e39e44648695a5
parent8ad02bc9649b0a69a0c09a23bd177a070b57af7d (diff)
downloadgit-ce5b6e711148d035478fcb18773a0abcef302d7e.zip
git-ce5b6e711148d035478fcb18773a0abcef302d7e.tar.gz
git-ce5b6e711148d035478fcb18773a0abcef302d7e.tar.bz2
annotate-blame test: add evil merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--t/annotate-tests.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index d25a7a1..8cb32e1 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -91,3 +91,12 @@ test_expect_success \
'Annotating an old revision works' \
'check_count -h master^ A 2'
+test_expect_success \
+ 'merge-setup part 4' \
+ 'echo "evil merge." >>file &&
+ EDITOR=: git commit -a --amend'
+
+test_expect_success \
+ 'Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor' \
+ 'check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1'
+