From: Junio C Hamano <junkio@cox.net>
Date: Mon, 6 Mar 2006 06:37:15 +0000 (-0800)
Subject: annotate-blame test: add evil merge.
X-Git-Tag: v1.3.0-rc1~13^2~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ce5b6e711148d035478fcb18773a0abcef302d7e;p=git.git

annotate-blame test: add evil merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index d25a7a1e7..8cb32e156 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'
+