projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'lt/fix-config' into lt/config
[git.git]
/
t
/
t1002-read-tree-m-u-2way.sh
diff --git
a/t/t1002-read-tree-m-u-2way.sh
b/t/t1002-read-tree-m-u-2way.sh
index
861ef4c
..
4d175d8
100755
(executable)
--- a/
t/t1002-read-tree-m-u-2way.sh
+++ b/
t/t1002-read-tree-m-u-2way.sh
@@
-20,7
+20,7
@@
compare_change () {
}
check_cache_at () {
}
check_cache_at () {
- clean_if_empty=`git-diff-files "$1"`
+ clean_if_empty=`git-diff-files
--
"$1"`
case "$clean_if_empty" in
'') echo "$1: clean" ;;
?*) echo "$1: dirty" ;;
case "$clean_if_empty" in
'') echo "$1: clean" ;;
?*) echo "$1: dirty" ;;