Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jw/gitweb-sample-update'
[gitweb.git]
/
t
/
t2070-restore.sh
diff --git
a/t/t2070-restore.sh
b/t/t2070-restore.sh
index 73ea13ede91c03e87e7af2a37f45032669ecda7b..2650df196670b8a98d7ba558b108e2d07697dfdc 100755
(executable)
--- a/
t/t2070-restore.sh
+++ b/
t/t2070-restore.sh
@@
-90,9
+90,8
@@
test_expect_success 'restore --ignore-unmerged ignores unmerged entries' '
git restore --ignore-unmerged --quiet . >output 2>&1 &&
git diff common >diff-output &&
- : >empty &&
- test_cmp empty output &&
- test_cmp empty diff-output
+ test_must_be_empty output &&
+ test_must_be_empty diff-output
)
'