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
old mode 100644 (file)
new mode 100755 (executable)
index c76fccf..43aa5d0
--- 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
-