development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

annotate-blame test: add evil merge.

Browse source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-03-05 22:37:15 -08:00
parent 8ad02bc964
commit ce5b6e7111
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
t/annotate-tests.sh
View file

@ -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'