summaryrefslogtreecommitdiff
path: root/t/t6044-merge-unrelated-index-changes.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6044-merge-unrelated-index-changes.sh')
-rwxr-xr-xt/t6044-merge-unrelated-index-changes.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6044-merge-unrelated-index-changes.sh b/t/t6044-merge-unrelated-index-changes.sh
index 97f7460b02..d55f1649f0 100755
--- a/t/t6044-merge-unrelated-index-changes.sh
+++ b/t/t6044-merge-unrelated-index-changes.sh
@@ -116,7 +116,7 @@ test_expect_success 'recursive' '
test_path_is_missing .git/MERGE_HEAD
'
-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 &&