mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
t3436: do not run git-merge-recursive in dashed form
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
27126692ba
commit
6160b2e9a4
|
@ -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
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue