Andrew's git / gitweb.git / blobdiff
?
Merge branch 'ar/wildcardpush'
[gitweb.git] / t / t6023-merge-file.sh
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index c76fccfb5a0811aca3bb5af67f8558745935148f..43aa5d033d0d8877b4f252710efa4bd26ee42d30 100755 (executable)
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -135,4 +135,3 @@ EOF
 test_expect_success "expected conflict markers" "git diff expect out"
 
 test_done
-