l10n: sv.po: Update Swedish translation (3288t0f0u)
[gitweb.git] / t / t3512-cherry-pick-submodule.sh
index 1b1e31100f22191a344bf0be4ab9b60c3fd2c9e7..ce48c4fcca80b183927292cc1e5902cfe286f994 100755 (executable)
@@ -10,7 +10,7 @@ KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
 test_submodule_switch "git cherry-pick"
 
-test_expect_failure 'unrelated submodule/file conflict is ignored' '
+test_expect_success 'unrelated submodule/file conflict is ignored' '
        test_create_repo sub &&
 
        touch sub/file &&