projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Imported Upstream version 2.23.3
[platform/upstream/git.git]
/
t
/
t7609-merge-co-error-msgs.sh
diff --git
a/t/t7609-merge-co-error-msgs.sh
b/t/t7609-merge-co-error-msgs.sh
index
f80bdb8
..
e904132
100755
(executable)
--- a/
t/t7609-merge-co-error-msgs.sh
+++ b/
t/t7609-merge-co-error-msgs.sh
@@
-105,7
+105,7
@@
test_expect_success 'not uptodate file porcelain checkout error' '
'
cat >expect <<\EOF
-error: Updating the following directories would lose untracked files in
it
:
+error: Updating the following directories would lose untracked files in
them
:
rep
rep2