Merge branch 'jc/fix-diff-files-unmerged' into maint

diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh
index 88dc6a781bad529b2460ae0295ad1f6bf0e0d0c7..caa687b5b46cea65ed16c70c29cc11e9e8b771f1 100755 (executable)
--- a/t/t1411-reflog-show.sh
+++ b/t/t1411-reflog-show.sh
@@ -41,7 +41,7 @@ Author: A U Thor <author@example.com>
 
     one
 EOF
-test_expect_failure 'override reflog default format' '
+test_expect_success 'override reflog default format' '
        git reflog --format=short -1 >actual &&
        test_cmp expect actual
 '