projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8ad02bc
)
annotate-blame test: add evil merge.
author
Junio C Hamano
<junkio@cox.net>
Mon, 6 Mar 2006 06:37:15 +0000
(22:37 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Mon, 6 Mar 2006 06:37:15 +0000
(22:37 -0800)
Signed-off-by: Junio C Hamano <junkio@cox.net>
t/annotate-tests.sh
patch
|
blob
|
history
diff --git
a/t/annotate-tests.sh
b/t/annotate-tests.sh
index d25a7a1e7a73f8968ec975e8fe2cb4ea8c2ba10e..8cb32e156b77e22da22525d95d783321082b5875 100644
(file)
--- 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'
+