X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Fannotate-tests.sh;h=114938c3ff18fadb130e6809fc14e89cfe3f36f2;hb=51937e533a39078a6d440b8a0b89bb491061c80b;hp=9c5a15a15e6be5548f7cc8836286cc5a8b39d4ca;hpb=1242642c468a7bcc335a676273eae4ced8a55f04;p=git.git diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index 9c5a15a1..114938c3 100644 --- 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' \