diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-09 00:42:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-13 23:10:19 -0700 |
| commit | 06d30f4f3eea71bce4cf48db3ea384976b3983b7 (patch) | |
| tree | f3b1d0ba712cc976dba5bc1d7d9dc5f104d81bee /t | |
| parent | 6d297f81373e19d86b8f02cb68120201d1b0ab1d (diff) | |
| download | git-06d30f4f3eea71bce4cf48db3ea384976b3983b7.tar.gz | |
recur vs recursive: help testing without touching too many stuff.
During git-merge-recur development, you could set an environment
variable GIT_USE_RECUR_FOR_RECURSIVE to use WIP recur in place
of the recursive strategy.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3402-rebase-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index b70e177ddd..d34c6cf6f3 100755 --- a/t/t3402-rebase-merge.sh +++ b/t/t3402-rebase-merge.sh @@ -51,7 +51,7 @@ test_expect_success setup ' ' test_expect_success 'reference merge' ' - git merge -s recur "reference merge" HEAD master + git merge -s recursive "reference merge" HEAD master ' test_expect_success rebase ' |