X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=.gitattributes;h=3747179db0a15f4f298060d1090cb85afa0f8222;hb=e4d2d5eda3d7b28796846489a0b809d3104cc28f;hp=d03ba2ae2936278e93f180b9fb1a80d39dcad683;hpb=76847a186d4960506c2e6607bc44e922a69a68b1;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