summaryrefslogtreecommitdiff
path: root/t/annotate-tests.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/annotate-tests.sh')
-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'
+