From: Michael Wallner <mike@php.net>
Date: Mon, 9 Mar 2015 07:55:55 +0000 (+0100)
Subject: merge=binary for bin/pharext
X-Git-Tag: v2.0.0~10
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=5c6492a43259671662b318c27c75ff235121617f;p=pharext%2Fpharext

merge=binary for bin/pharext
---

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..d03ba2a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+bin/pharext			merge=binary
diff --git a/bin/pharext b/bin/pharext
index c0c47e4..bf6f0c5 100755
Binary files a/bin/pharext and b/bin/pharext differ