| commit | 6160b2e9a486f5dc29f621e94a0e5dcce0ab3d52 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <gitster@pobox.com> | Wed Aug 26 21:46:23 2020 |
| committer | Junio C Hamano <gitster@pobox.com> | Wed Aug 26 21:46:23 2020 |
| tree | f72303a02840f480d66a121a247645056f2c1bf6 | |
| parent | 27126692ba1688081d8427220087bb7662594bd9 [diff] |
t3436: do not run git-merge-recursive in dashed form Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh index 627fa16..996e827 100755 --- a/t/t3436-rebase-more-options.sh +++ b/t/t3436-rebase-more-options.sh
@@ -36,7 +36,7 @@ mkdir test-bin && write_script test-bin/git-merge-test <<-\EOF - exec git-merge-recursive "$@" + exec git merge-recursive "$@" EOF '