t7004: ship trustdb to avoid gpg warnings

diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index 43aa5d033d0d8877b4f252710efa4bd26ee42d30..ecc11c1a8448d7a5825e8ade7d7aaa7c43efef9f 100755 (executable)
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -134,4 +134,9 @@ EOF
 
 test_expect_success "expected conflict markers" "git diff expect out"
 
+test_expect_success 'binary files cannot be merged' '
+       ! git merge-file -p orig.txt ../test4012.png new1.txt 2> merge.err &&
+       grep "Cannot merge binary files" merge.err
+'
+
 test_done