]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t3436: do not run git-merge-recursive in dashed form
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Aug 2020 21:46:23 +0000 (14:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Aug 2020 21:46:23 +0000 (14:46 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3436-rebase-more-options.sh

index 627fa163a2dd2062d9a6cf0a6be965267082bcb4..996e82787e9b995a16f66d3656df7e732502237f 100755 (executable)
@@ -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
 '