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.20.2
[platform/upstream/git.git]
/
t
/
t6043-merge-rename-directories.sh
diff --git
a/t/t6043-merge-rename-directories.sh
b/t/t6043-merge-rename-directories.sh
index
2e28f29
..
4a71f17
100755
(executable)
--- a/
t/t6043-merge-rename-directories.sh
+++ b/
t/t6043-merge-rename-directories.sh
@@
-3583,7
+3583,7
@@
test_expect_success '11d-check: Avoid losing not-uptodate with rename + D/F conf
grep -q stuff z/c &&
test_seq 1 10 >expected &&
echo stuff >>expected &&
- test_cmp expected z/c
+ test_cmp expected z/c
&&
git ls-files -s >out &&
test_line_count = 4 out &&