From: Michael Wallner <mike@php.net>
Date: Wed, 2 Sep 2015 17:02:28 +0000 (+0200)
Subject: bin/pharext.update merge=binary
X-Git-Tag: v4.1.0~12
X-Git-Url: https://git.m6w6.name/?p=pharext%2Fpharext;a=commitdiff_plain;h=e4d2d5eda3d7b28796846489a0b809d3104cc28f

bin/pharext.update merge=binary
---

diff --git a/.gitattributes b/.gitattributes
index d03ba2a..3747179 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 bin/pharext			merge=binary
+bin/pharext.update	merge=binary