From 6160b2e9a486f5dc29f621e94a0e5dcce0ab3d52 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 26 Aug 2020 14:46:23 -0700 Subject: t3436: do not run git-merge-recursive in dashed form Signed-off-by: Junio C Hamano --- t/t3436-rebase-more-options.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't') 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 ' -- cgit v1.2.3