Merge branch 'hv/submodule-find-ff-merge'

diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index 7b5db8066fbb7113f4e97f2987cee6c4ed913c41..fcac4725982096af98414c5d40df2d4c14be9454 100755 (executable)
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -31,8 +31,7 @@ test_expect_success 'Report new path with conflict' '
 cat >expect <<EOF
 # On branch side
 # Unmerged paths:
-#   (use "git reset HEAD <file>..." to unstage)
-#   (use "git add <file>..." to mark resolution)
+#   (use "git add/rm <file>..." as appropriate to mark resolution)
 #
 #      deleted by us:      foo
 #