Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
update-ref: allow --no-deref with --stdin
[gitweb.git]
/
t
/
t6022-merge-rename.sh
diff --git
a/t/t6022-merge-rename.sh
b/t/t6022-merge-rename.sh
index b760c223c6a56609b7dace5353671aec8243b85d..53cc9b2ffbdbc551c358c8d5d1d4185ef63f0c0b 100755
(executable)
--- a/
t/t6022-merge-rename.sh
+++ b/
t/t6022-merge-rename.sh
@@
-893,8
+893,7
@@
test_expect_success 'do not follow renames for empty files' '
git mv empty1 empty2 &&
git commit -m rename &&
test_must_fail git merge empty-base &&
- >expect &&
- test_cmp expect empty2
+ test_must_be_empty empty2
'
test_done