Merge branch 'maint' of git://github.com/git-l10n/git-po into maint

diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 725f31686187ea2019c0a547d654822acaae949a..6fa0c70506b4a4f6b066d6f3d25aa0e499b419b5 100755 (executable)
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -203,7 +203,7 @@ test_expect_success 'mergetool skips resolved paths when rerere is active' '
     git reset --hard
 '
 
-test_expect_failure 'conflicted stash sets up rerere'  '
+test_expect_success 'conflicted stash sets up rerere'  '
     git config rerere.enabled true &&
     git checkout stash1 &&
     echo "Conflicting stash content" >file11 &&