From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Aug 2020 21:46:23 +0000 (-0700)
Subject: t3436: do not run git-merge-recursive in dashed form
X-Git-Tag: v2.29.0-rc0~107^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6160b2e9a486f5dc29f621e94a0e5dcce0ab3d52;p=thirdparty%2Fgit.git

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 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
 '