projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pe/date'
[git.git]
/
t
/
annotate-tests.sh
diff --git
a/t/annotate-tests.sh
b/t/annotate-tests.sh
index
9c5a15a
..
114938c
100644
(file)
--- a/
t/annotate-tests.sh
+++ b/
t/annotate-tests.sh
@@
-94,7
+94,7
@@
test_expect_success \
test_expect_success \
'merge-setup part 4' \
'echo "evil merge." >>file &&
- EDITOR=: git commit -a --amend'
+ EDITOR=:
VISUAL=:
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' \