From 5c6492a43259671662b318c27c75ff235121617f Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 9 Mar 2015 08:55:55 +0100
Subject: [PATCH] merge=binary for bin/pharext

---
 .gitattributes |   1 +
 bin/pharext    | Bin 38388 -> 38953 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 .gitattributes

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 c0c47e4762f0c695e129d539cfc19ab25de5214d..bf6f0c59245183a8ae8b253304458996357a18c0 100755
GIT binary patch
delta 714
zcmeyenrY<*rVZ^<%xr;wCwEC1fa$$bI$-*ZlpdItl{OaWVrF0fstEznFPF^Co17r6
zAfO=$5d_h4@8@otJV9C$tYeR~zCbD;L=r^X)-9bj`M0#DKq(7E5JdlaWOHY-iHs^(
zM~n=_&Tbiq8}`XS?0zq!3zFX~FY95Sps%IH#i^jB;9roM7aZ)PP>`KksZf+!oL^d$
zoC=n4C`&9t5z*)3EGWt>ODsuMPywp8=HlXnnG%$mn4*xV0FwsFPCjTT!jhJmlR8;(
zf|yEiae01G3dGowjH3MVVucvjisaOSlFa-(kTB5f$sglIC-=teFhdv{oSB}dP?C|V
z5a8h$1kqiPSd^Hn5EGCAbeu{-Vsdt3I@r1TligxdG!a@|D+=<9O2C>6N|SOjlNCT7
zEXfDD66`9V^S}&zZrZ#$wwr76i43*L(=&87OJ~~2Fvd*k)ZE<Is>{52ea9ST4v_zW
zf#^8-U#+ZF0nkmU6(#XdSLqdG6euL-r6{D9rRJ5CCg$W+D!`Ov<`tI!1wcxG`t>J!
z^;k0l&6=!OX*qeaoAl(4N+Bgs@FxQmB_`!Se25hMnI)-3)?AYn%{3+`RB=x}R4Fpq
zeuClTXFWeAKd}Ibg-wp>uAFSwr_bV^S)ws{SD*CciG3cEohl?Zf9!kCCgW$yn!cHL
b+lJn`I=XXh@^+Qk9kgU(U|?`}@^u0LXjtsn

delta 455
zcmZ3vf$7U?rVZ^<%r>k3Ozx600MmP=bini*DLpVPD{U+g!NkA-R1*TC<=BsWpPV4A
zAh25!A_$^a#N7KZd4jYiSjQe|eSs7{h$M*4zpOra@^5KPfd^1yK(u4^+q}spGOA!5
zF)|Q4yJaA5*e3(A`@M`VNPe@ttcSf|K~ZK|Vo9okN_J|cH5Vrr=j8Z4(aCzTI~X}9
z%fzKHa&EpG*Ue>>nWmsol$w}RkXVwTp;D5OS*&Z9Sd?BItyG*}T9lls6sxDCUyzYl
zlv+^|UyzubotU1gSCCPlq&azIhQ{RnOzp|Znc5s~nK>n?MX4#1?J`w2@5;23ncNp6
zJ~=>-bF);NDf4E(&biE!y?d?n;jT)~O#!+J&IMVI%+Cax2INncb(h;*(#OLHbaY^k
z=wyRxjmg11N|Vbc=ySrX)R_Ekg7oC06FepxI4f;7n0S{>hL64A@!!WSjjx#Iz4*39
Ryx-ZT=PED|8Qh(GodARYr%eC=

-- 
2.30.2