Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
grep: --name-only over binary
[gitweb.git]
/
t
/
t7607-merge-overwrite.sh
diff --git
a/t/t7607-merge-overwrite.sh
b/t/t7607-merge-overwrite.sh
index 513097c1a1cfac4d6606f8c225f45b04d69356f0..49f4e1599acd829fdd930c1f9b5bc30ac719053d 100755
(executable)
--- a/
t/t7607-merge-overwrite.sh
+++ b/
t/t7607-merge-overwrite.sh
@@
-53,7
+53,7
@@
test_expect_success 'will not overwrite staged changes' '
test_cmp important c2.c
'
-test_expect_
failure
'will not overwrite removed file' '
+test_expect_
success
'will not overwrite removed file' '
git reset --hard c1 &&
git rm c1.c &&
git commit -m "rm c1.c" &&