admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2020-08-26 14:46:23 -07:00
parent 27126692ba
commit 6160b2e9a4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t3436-rebase-more-options.sh
View File

@@ -36,7 +36,7 @@ test_expect_success 'setup' '
mkdir test-bin && mkdir test-bin &&
write_script test-bin/git-merge-test <<-\EOF write_script test-bin/git-merge-test <<-\EOF
exec git-merge-recursive "$@" exec git merge-recursive "$@"
EOF EOF
' '