t3436: do not run git-merge-recursive in dashed form
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 26, 2020 at 14:46 UTC
6160b2e9a486f5dc29f621e94a0e5dcce0ab3d52
1 file changed
+1
-1
t/t3436-rebase-more-options.sh
+1
-1
@@ -36,7 +36,7 @@ test_expect_success 'setup' '
36
37
mkdir test-bin &&
38
write_script test-bin/git-merge-test <<-\EOF
39
- exec git-merge-recursive "$@"
39
+ exec git merge-recursive "$@"
40
EOF
41
'
42