Andrew's git / gitweb.git / blobdiff
?
t7004: ship trustdb to avoid gpg warnings
[gitweb.git] / t / t6023-merge-file.sh
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index 1decbfba63298e01a757851f9954fac6c54ba494..ecc11c1a8448d7a5825e8ade7d7aaa7c43efef9f 100755 (executable)
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -140,4 +140,3 @@ test_expect_success 'binary files cannot be merged' '
 '
 
 test_done
-