Merge branch 'maint-1.6.6' into maint

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 5f3916bf4ffe1f9747d9b863056d2f16dff15619..b8cf2603a195af406d3606712e45fd1195c1588f 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -419,7 +419,8 @@ 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' '