diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-03-12 13:43:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-12 13:43:36 -0800 |
| commit | 3dcf2d0e00d615cbc046f6ebb5eff3e6fcb1442f (patch) | |
| tree | acb0bd9dc787ad2daafffa6cf1638ddb4705767a /t | |
| parent | Merge branch 'master' into next (diff) | |
| parent | revision traversal: --remove-empty fix. (diff) | |
| download | tgif-3dcf2d0e00d615cbc046f6ebb5eff3e6fcb1442f.tar.xz | |
Merge branch 'jc/empty' into next
* jc/empty:
revision traversal: --remove-empty fix.
annotate-tests: override VISUAL when running tests.
Diffstat (limited to 't')
| -rw-r--r-- | t/annotate-tests.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index 9c5a15a15e..114938c3ff 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' \ |