merge=binary for bin/pharext

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..d03ba2a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+bin/pharext                    merge=binary

diff --git a/bin/pharext b/bin/pharext
index c0c47e4762f0c695e129d539cfc19ab25de5214d..bf6f0c59245183a8ae8b253304458996357a18c0 100755 (executable)
Binary files a/bin/pharext and b/bin/pharext differ