diff --git a/tests/test-simplemerge-cmd.out b/tests/test-simplemerge-cmd.out
index 8141eb588a69a7b55ec50be707781ceb376ad3dc..b46c9e5892d59141508c642a79ff6e01b14e80f2
GIT binary patch
literal 2557
zc%1E(O^?$s5QaJDSIi|hvJxCCK<c8EI8-X4dqW(Yc#>FkY_C0`8-6`wJK1(WV9SA9
zeM-mk@r>uSTSC(d(<#$|wvEsrmB)tkR1D}lgfKP@qC{Dw?V=U|3rjuvq6Fuap%_XQ
z0!cg4bFZ9sb-GbPV@<17Lm?YJ<n>^#va_)SImySo=9HiEI=W{w8d)5KHw?5oRscEr
zh?v^Bn!9R+(%e!BRb^~7D5Hi2?p2mp<}pvS{DJ9Jo)X@H7BxPp-dg)#+AraKE*Jj2
zUM<cpLe|0{%(T=Jwe`dS!hkh;g5a=G?F4kNvrCMsl@We|mS?j>WK*62E6MHyXthTW
zr_N7ed8mZ<bmTlU$(t7x-lKL!P=nK$mGgc3^>+6IHrvnZ4P38xH?Y0^a`UYyfY&ZL
z0`(rTI*1u32acq)q6rR)dagWc4q6m6dcJ2!S2@YrIX)r2QMm?#<SU8+3^o`-B<AhT
zLhJ32A^3OVm~&iDAh8vrrnhq%6~O*PfAES3O{R#cJqGsT&6a;gCx>2;vW7ER7eB(P
zfNH~sng#`V<)Ov0V?dtigBEz~evdwIjF<;8hX8r*6@=F5SON%+k8^^`v1fWqX3zY+
zpeYjwg^Y+x3sG#Tuhi}7B?gcdqLL|}QZlPwcm(v=#jdz)&yjJ!3!qfNX`WiL2_pgT
zRm8hvzq?W4f)_^T7>*BXB*$-F2?uYP$c#gcK5`1*jRP8f-%hl%I?wGQv5UlBkXRk@
e(rG=`RJL(AKjDdr|GsT!m`7ezby3w{RrMQW=t>y?