annotate-blame test: add evil merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Mar 5, 2006 at 22:37 UTC
ce5b6e711148d035478fcb18773a0abcef302d7e
1 file changed
+9
t/annotate-tests.sh
+9
@@ -91,3 +91,12 @@ test_expect_success \
91
'Annotating an old revision works' \
92
'check_count -h master^ A 2'
93
94
+test_expect_success \
95
+ 'merge-setup part 4' \
96
+ 'echo "evil merge." >>file &&
97
+ EDITOR=: git commit -a --amend'
98
+
99
+test_expect_success \
100
+ 'Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor' \
101
+ 'check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1'
102
+