Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t9010 (svn-fe): avoid symlinks in test
[gitweb.git]
/
t
/
t7060-wtstatus.sh
diff --git
a/t/t7060-wtstatus.sh
b/t/t7060-wtstatus.sh
index 0919ec46f67d47f536c2fe68c783e02aeb384c86..fcac4725982096af98414c5d40df2d4c14be9454 100755
(executable)
--- a/
t/t7060-wtstatus.sh
+++ b/
t/t7060-wtstatus.sh
@@
-31,7
+31,6
@@
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/rm <file>..." as appropriate to mark resolution)
#
# deleted by us: foo