From ce5b6e711148d035478fcb18773a0abcef302d7e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 5 Mar 2006 22:37:15 -0800 Subject: [PATCH] annotate-blame test: add evil merge. Signed-off-by: Junio C Hamano --- t/annotate-tests.sh | 9 +++++++++ 1 file changed, 9 insertions(+) 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' + -- 2.26.2