t3436: do not run git-merge-recursive in dashed form

gitster · gitster · commit 6160b2e9a486 · 2020-08-26T14:46:23.000-07:00
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ test_expect_success 'setup' '`
`36`	`36`
`37`	`37`	`mkdir test-bin &&`
`38`	`38`	`write_script test-bin/git-merge-test <<-\EOF`
`39`		`- exec git-merge-recursive "$@"`
	`39`	`+ exec git merge-recursive "$@"`
`40`	`40`	`EOF`
`41`	`41`	`'`
`42`	`42`