Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
refs: use warning() instead of fprintf(stderr, "warning: ")
[gitweb.git]
/
t
/
t2200-add-update.sh
diff --git
a/t/t2200-add-update.sh
b/t/t2200-add-update.sh
index b2ddf5ace3581bc2a7056c61b9d43499b2657b65..5a8d52f2ff5ecfea8a1d4f9d39a2ed4a08c822e0 100755
(executable)
--- a/
t/t2200-add-update.sh
+++ b/
t/t2200-add-update.sh
@@
-150,7
+150,7
@@
test_expect_success 'add -u resolves unmerged paths' '
echo 2 >path3 &&
echo 2 >path5 &&
git add -u &&
- git ls-files -s
"path?"
>actual &&
+ git ls-files -s
path1 path2 path3 path4 path5 path6
>actual &&
{
echo "100644 $three 0 path1"
echo "100644 $one 1 path3"