Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rerere: do use multiple variants
[gitweb.git]
/
t
/
t4200-rerere.sh
diff --git
a/t/t4200-rerere.sh
b/t/t4200-rerere.sh
index 6fcc6d4e75c348b98ac30eec2977df39f8676359..b1bda20923c96a91b8796393ce73235c55307240 100755
(executable)
--- a/
t/t4200-rerere.sh
+++ b/
t/t4200-rerere.sh
@@
-412,7
+412,7
@@
concat_insert () {
cat early && printf "%s\n" "$@" && cat late "$last"
}
-test_expect_
failure
'multiple identical conflicts' '
+test_expect_
success
'multiple identical conflicts' '
git reset --hard &&
test_seq 1 6 >early &&