Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t1300: demonstrate that --replace-all can "invent" newlines
[gitweb.git]
/
t
/
t6044-merge-unrelated-index-changes.sh
diff --git
a/t/t6044-merge-unrelated-index-changes.sh
b/t/t6044-merge-unrelated-index-changes.sh
index 5e472be92b7c9cec264556b25d0f9bc0c7e0f530..23b86fb9778980ab813d5e252065ebe34fe4736d 100755
(executable)
--- a/
t/t6044-merge-unrelated-index-changes.sh
+++ b/
t/t6044-merge-unrelated-index-changes.sh
@@
-112,7
+112,7
@@
test_expect_success 'recursive' '
test_must_fail git merge -s recursive C^0
'
-test_expect_
failure
'recursive, when merge branch matches merge base' '
+test_expect_
success
'recursive, when merge branch matches merge base' '
git reset --hard &&
git checkout B^0 &&