Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: minor cleanup in a use case in 'git stash' manual
[gitweb.git]
/
t
/
t1000-read-tree-m-3way.sh
diff --git
a/t/t1000-read-tree-m-3way.sh
b/t/t1000-read-tree-m-3way.sh
index 17f519f547356d550c16668b929d9140b568a6f7..807fb83af8c65304f1dae2ee35ba0f2909ddf465 100755
(executable)
--- a/
t/t1000-read-tree-m-3way.sh
+++ b/
t/t1000-read-tree-m-3way.sh
@@
-131,7
+131,7
@@
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
check_result () {
git ls-files --stage | sed -e 's/ '"$_x40"' / X /' >current &&
-
git diff
expected current
+
test_cmp
expected current
}
# This is done on an empty work directory, which is the normal