X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=.gitattributes;h=3747179db0a15f4f298060d1090cb85afa0f8222;hb=f55545591b80c22e8e3ca4dffe2ac68c59090835;hp=d03ba2ae2936278e93f180b9fb1a80d39dcad683;hpb=5c6492a43259671662b318c27c75ff235121617f;p=pharext%2Fpharext

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