git.99rst.org
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
| inline |
side by side
(parent:
2712669
)
t3436: do not run git-merge-recursive in dashed form
author
Junio C Hamano
<redacted>
Wed, 26 Aug 2020 21:46:23 +0000
(14:46 -0700)
committer
Junio C Hamano
<redacted>
Wed, 26 Aug 2020 21:46:23 +0000
(14:46 -0700)
Signed-off-by: Junio C Hamano <redacted>
t/t3436-rebase-more-options.sh
patch
|
blob
|
history
diff --git
a/t/t3436-rebase-more-options.sh
b/t/t3436-rebase-more-options.sh
index 627fa163a2dd2062d9a6cf0a6be965267082bcb4..996e82787e9b995a16f66d3656df7e732502237f 100755
(executable)
--- 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
'
git clone https://git.99rst.org/PROJECT