Merge branch 'lt/setup' into __/setup-n-mv

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index 1148b0257dafd4e9b63e030052b47b527b5c0d3b..b6a2edd8878c910ad177b8b277bedf99f60d9416 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=: VISUAL=: git commit -a --amend'
+     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' \