diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-26 23:46:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-26 23:46:23 +0200 |
| commit | 6160b2e9a486f5dc29f621e94a0e5dcce0ab3d52 (patch) | |
| tree | f72303a02840f480d66a121a247645056f2c1bf6 /t/t3436-rebase-more-options.sh | |
| parent | rebase: add --reset-author-date (diff) | |
| download | git-6160b2e9a486f5dc29f621e94a0e5dcce0ab3d52.tar.xz git-6160b2e9a486f5dc29f621e94a0e5dcce0ab3d52.zip | |
t3436: do not run git-merge-recursive in dashed form
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3436-rebase-more-options.sh')
| -rwxr-xr-x | t/t3436-rebase-more-options.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh index 627fa163a2..996e82787e 100755 --- a/t/t3436-rebase-more-options.sh +++ b/t/t3436-rebase-more-options.sh @@ -36,7 +36,7 @@ test_expect_success 'setup' ' mkdir test-bin && write_script test-bin/git-merge-test <<-\EOF - exec git-merge-recursive "$@" + exec git merge-recursive "$@" EOF ' |