Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ls/editor-waiting-message'
[gitweb.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 f80bdb81e1f12124e32d5cd2c5c0ecdcd82dc782..e90413204ee32cafc3380244a5cf013eadcd72c1 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