Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-simplemerge-cmd.out @ 4360:d5c3a70f8422
polish the simplemerge command; add a test
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Mon, 16 Apr 2007 20:17:39 -0300 |
| parents | |
| children | ea7b982b6c08 |
line wrap: on
line diff
new file mode 100644 index 0000000000000000000000000000000000000000..8141eb588a69a7b55ec50be707781ceb376ad3dc GIT binary patch literal 2581 zc%1E(J#X7E5QaPJSKOklGSH4jTfiv-bTHte&Q^4w#FIprA{p{jNB#9Zl2YuXA906n z=3q#t`*@D`k}jd?h3S;(K-)%Wkji62dMXC=9YPqJ22r9c(&wTU0Sik#`l1Bqm7y3) z76M5-(yv}Q?fU#f35_+aRt<%0c$e3sxysJQ667TB^O{qB$m`^u&1htC6y7k<`cwhr z=p$lkXEk@#3Z=QF5~|ABYEVWE3*3t=vCLDRX!!%vi##Q~0WE5LR=u_MzqDV%+gvXE zd%ap*T!gHJL6~W&C2H%51B3x<^aR0SquL4RXlIugRVyR>1TD{IiO8lr16Gnf1kmb$ zAkLki#qv-IALzt+VUkzBQFxEq6+sP7V^+@B-RHagH`wkzZnki<+26wM?$hm;q5xj| z<OtMz#Of$!oE$ik(uyWHD(boNtT|{=(CGP`A+1u5^s{k}cZp9`uEQ|-m|_5f4Tcb@ z`EzHX^>)Z0{GM3O^4v@yu@$4H*K;Zrz<x)6^oj^gritl22KM5QEx$%5hhC7fW>pl{ z#fPvipxW~0rh!3Td3dq(7?5ZCs0kjwKcEjBBj$n3AwZsc2BCG@o&bX5<Gi49?3wPA z*)u;cXvzdaAtU0_LKI!<D|LH*m;t1PsA$SNmCWh~o&Y^|u`4dyb7UO!0w`5*nx~g+ z!brde74h!b?|xLc;DymShU3i|$?@G+!qHnMGUHIAkDS7H<A8?mxibx|FLS#}?JBju iNUe@|X}6wgE894nuk=L4f9JL{%p<Srx~l6Ub^Qd3d`%eu