Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
wildmatch test: cover a blind spot in "/" matching
[gitweb.git]
/
t
/
t7607-merge-overwrite.sh
diff --git
a/t/t7607-merge-overwrite.sh
b/t/t7607-merge-overwrite.sh
index e8ec54c134d92c17315a29661069eb9a7a921ba6..9444d6a9b9026748028178c4b66ee8bbbc1d89fa 100755
(executable)
--- a/
t/t7607-merge-overwrite.sh
+++ b/
t/t7607-merge-overwrite.sh
@@
-115,7
+115,7
@@
cat >expect <<\EOF
error: The following untracked working tree files would be overwritten by merge:
sub
sub2
-Please move or remove them before you
can
merge.
+Please move or remove them before you merge.
Aborting
EOF