Merge branch 'db/delta-applier' into svn-fe

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 5f3916bf4ffe1f9747d9b863056d2f16dff15619..7be2ff38fc92088d4caff9ea13b1d78a1b040b40 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -419,10 +419,11 @@ test_expect_success 'resetting an unmodified path is a no-op' '
 '
 
 cat > expect << EOF
-file2: locally modified
+Unstaged changes after reset:
+M      file2
 EOF
 
-test_expect_success '--mixed refreshes the index' '
+test_expect_success C_LOCALE_OUTPUT '--mixed refreshes the index' '
        echo 123 >> file2 &&
        git reset --mixed HEAD > output &&
        test_cmp expect output