Files
xigmanas-bastille-extension/conf/system/include/12.3/diff3
T

98 lines
28 KiB
Plaintext
Raw Normal View History

ELF >`: @pj@8 @@@ @ hh¨¨ ¨  T*T*`*`: `: P9P9°c°ƒ °ƒ xx(e(• (• ÀÈŠØc؃ ؃ PPRåtd°c°ƒ °ƒ xxPåtd$$ $  QåtdÀÀ À HH/libexec/ld-elf.so.1FreeBSD8[FreeBSDFreeBSD %* >FNŽ–œ¢§­²¹ÀÈÎÖÜãï !&-5;CIRY`gov�ˆ�—£¯¼(• — _€!@„Ð!öÀ!qè!{à!ýØ!Á°(z˵(zÔ0 ÁL�05¼Pvž¦Ý£k bd¶žƒ³¢÷æƒÓªÍ3Ä÷88
+)03 7.$!&%/16'#2-4",  
(*5 __progname_init_tlsatexitenvironexit_Jv_RegisterClasses__error__srget__stack_chk_fail__stack_chk_guard__stderrp__stdinp__stdoutp__swbuf_exitabortbcmpclosedup2execvpfclosefprintffputcfreopenfstatfwritegetopt_longmemcpyoptargoptindpipeprintfsetlocalesignalstatstrcmpstrncmpvforkwaitpidfputsvfprintfcallocmallocmemsetreallocfflushstrerror_rgetpidkillsigactionsigaltstacksigemptysetstrlenwritereadlibc.so.7FBSD_1.0FBSD_1.5€!2Ð!3À!4è!5à!6Ø!7x• €• ˆ• �• ˜•  • ¨• °• ¸• À• È• Е Ø•  à• è• ð• ø• – – – 
–  – (– 0– 8–  @– H– P– 
X– `–  h– !p–  x– #€– %ˆ– $�– "˜– & – '¨– +°– ,¸– *À– -È– .Ж (Ø– )à– /read failedstrip-trailing-cr--strip-trailing-crinvalid diff format; incorrect leading line charsshow-overlapIf a FILE is `-', read standard input.-m --merge Output merged file instead of ed script (default -A).internal error: screwup in format of diff blocks%d:||||||| %s
-x --overlap-only Output overlapping changes.Written by %s, %s, %s,
%s, %s, %s, %s,
%s, %s, and others.
Unknown system errorRandy Smithed--help Output this help.internal error: invalid diff type passed to output%ld,%lds/^\.//
aeimvx3AEL:TX%s%s:%d: GNU diffutilsclose%s (%s) %s
diff32.8.7-/usr/bin/diff-i Append `w' and `q' commands to ed scripts.====%s
Report bugs to <bug-gnu-utils@gnu.org>.--diff-program=PROGRAM Use PROGRAM to compare files.%lda
%ldc
Written by %s, %s, %s,
and %s.
Written by %s, %s, %s,
%s, %s, and %s.
Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE
-v --version Output version info.invalid diff format; incomplete last line%ld,%ldc
`-' specified for more than one input filelabelwrite failedsubsidiary program `%s' could not be invokedsubsidiary program `%s' not found extra operand `%s'mergeversion%s
waitpidExit status is 0 if successful, 1 if conflicts, 2 if trouble.-3 --easy-only Output unmerged nonoverlapping changes.pipe%s: show-all-X Output overlapping changes, bracketing them.-a --text Treat all files as text.<<<<<<< %s
easy-only%ldd
Written by %s, %s, %s,
%s, %s, %s, %s,
and %s.
--horizon-lines=100-ainput file shrankmissing operand after `%s'overlap-only %s
Try `%s --help' for more information.Written by %s, %s, and %s.
: %s: r--strip-trailing-cr Strip trailing carriage return on input.subsidiary program `%s' failed (exit status %d)=======
Written by %s.
initial-tab%s: diff failed: ---
w
q
%s %s
Written by %s and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, and %s.
textinvalid diff format; invalid change separatorNo newline at end of fileThis is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
program errordiff-program-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE.-A --show-all Output all changes, bracketing conflicts.subsidiary program `%s' failedstack overflowhelp
%s
%s
%s
\ %s
Written by %s, %s, %s,
%s, %s, %s, and %s.
standard outputCompare three files line by line.-E --show-overlap Output unmerged changes, bracketing conflicts.-T --initial-tab Make tabs line up by prepending a tab.fstat%lda
<<<<<<< %s
Written by %s, %s, %s,
%s, and %s.
internal error: invalid diff type in process_diff--%s:>>>>>>> %s
%ld,%ldd
fork.
Copyright (C) 2004 Free Software Foundation, Inc.too many file label optionsincompatible options-L LABEL --label=LABEL Use LABEL instead of file name. %lds/^\.//
à> S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S â= S S S S S S S S S S S S S >> S S S �> S S S S S S U> S S S S S S S z> S S S †> S S S S S S S S �> S S S ”> S S S > S S S ©> S S S S S S S S µ> S >  8 3i eÎ ¢ T¹ L1 m¼ xÍ A$ EÌ  a7 v D f Ü Ö Š Ø X ·    ‡ } Ø 6 l Þg Üf g g g g 'g .g g 5g memory exhausted; \$lL||L¤L7Ô|7ü¼7Ü7< 8\L>ŒLA¼<BäìCŒD<¼D\ìD„ E¬<EÔ\Eü¼E$üEL,FtLFœŒFÌ|GülH,ÌI\|J„ŒJ¤¬JÄ\KìüKzRx �$0A†C
JƒŒ�Ž�,DA†C
JƒŒ�Ž�ó $tø[A†C
Bƒg E ,œ óA†C
PƒŒ�Ž�E A $Ìp50A†C
W A ôx59A†C
˜5A†C
4˜5)A†C
Bƒ,T¨52A†C
MƒŒ�Ž�— A ,„¸;ôA†C
PƒŒ�Ž�; A $´ˆ>ìA†C
BƒÛ A ,ÜP?£A†C
IƒŽ�‹ A $ Ð@“A†C
‰ A 4HA0A†C
$TXA$A†C
Z A $|`AA†C
K A $¤XA'A†C
] A $Ì`AA†C
K A $ôXA^A†C
T A $�A<A†C
r A $D¨A+A†C
Bƒ[ E $l°AA†C
S A ,”¨A1A†C
CƒŽ` E ,ĸAðA†C
LƒŽ�Ú A ,ôxBãA†C
LƒŽ�Å A ,$8CXA†C
PƒŒ�Ž� A $ThD§A†C
Eƒ˜ A |ðDA†C
A œàDA†C
$¼àD­A†C
FƒŽ�,ähE•A†C
JƒŒ�Ž�† ,ØE`A†C
M A M UH‰åAWAVAUATSPI‰þL‹?IcÇL�$ÇIƒÄHƒ=y\uL‰%p\IƒÆE…ÿ~I‹H…Àu¸Øƒ H…Àt/H‰÷è6錄H‰aZHƒÀ¶Hÿ„Ét΀ù/tèëí¾A½I9õsU¸¢‰×A‰È1À¢»¹ƒør 1ɸ¢Aƒ}%uI‹EH‰EÐD‰Æ‰ÚAÿU¾H‹MÐH‰IƒÅI9õr«èœ5D‰ÿL‰öL‰âèD‰ÿL‰öL‰âèð‰Çè‰5f„UH‰åAWAVAUATSPH‰Uи؃ H…À…ÓI‰÷A‰ü¿€< è05¸`: »`: H)ÃL�kH…ÛH‰ØIHÅHÁøtBE1öë!f.„IƒÆH…ÛH‰ØIHÅHÁøI9ÆsJ‹õ`: HƒørÛD‰çL‰þH‹UÐÿÐëÍè�4¸`: A¾`: I)ÆM�nM…öL‰ðIHÅHÁøt91Ûëf�HƒÃM…öL‰ðIHÅHÁøH9ÃsH‹Ý`: HƒørÛD‰çL‰þH‹UÐÿÐëÍHƒÄ[A\A]A^A_]Ãf.„@UH‰åSP¹`: ¸`: H)ÈH�XH…ÀH‰ÁHHËHÁùu HƒÄ[]éú3H…ÀHIØHÁûë�H…ÛtâH‹ÝX: HƒÃÿHƒøréÿÐëåÌÌÌÌÌUH‰å€=UXu(H‹
AXH‹H…
ëÌ¿
è1ëÀ¿Ó ¾1 ºL ¹U 1ÀèÙ0H‹=bßöG@…Êèã0…À…ÇH‹ôÞH;EÐ…k1ÀH�Äø[A\A]A^A_]ÃM‹6¾ L‰÷èv0…À„”AƒÇD‰øH‹�þÿÿH‹<Á¾ èR0D‰û…À„mÇ…tÿÿÿ‰Øƒð‰…xÿÿÿ‰�|ÿÿÿÇ…hÿÿÿÇ„…hÿÿÿ‰ØÇ„…hÿÿÿ¾ L‰÷èý/…ÀL‹½þÿÿtCH�µpþÿÿL‰÷è#0…Àˆ·…ˆþÿÿ%ð=@uI‹º× ¿¾1Àè)I‹_¾ H‰ßèž/…ÀtGM�wH�µpþÿÿH‰ßèÇ/…Àˆ¯·…ˆþÿÿ%ð=@uI‹º× ¿¾1Àè³(I‹_¾ H‰ßèB/…ÀtGM�wH�µpþÿÿH‰ßèk/…ÀˆS·…ˆþÿÿ%ð=@uI‹º× ¿¾1ÀèW(1ÀH‰…`þÿÿ¿1öè2/Hc…pÿÿÿI‹ÇHc…lÿÿÿI‹<ÇM‰üL�½hþÿÿH‰ÞL‰úè—I‰ÆHc…hÿÿÿH‰…ðýÿÿI‹<ÄH‰ÞL‰úèwHÇ…øýÿÿH‰E€L‰uˆL‰ñH Á„XH��øýÿÿA¹ # ë4»L‹�8þÿÿA‰H‹…þÿÿL‰H‹E€L‹uˆH‰ÁL ñH‹�èýÿÿ„WÀ)E�)E H…ÀH‰�þÿÿtM…öt)H‹H1ÀI;NŸÀëf.„¸ë f„1À‰ÁH‹\Í€H‹SH‰\Í�H‰\Í H‹s@H‰tÍ€HÇC@‰Çƒ÷H‹tý€H…öuUë|€H‹\ý�HƒÃ@H‰3H‰tý�H‹\ý€H‹[@H‰\ý€HÇF@H‹v1ÿH9ò@œÇHLÖ1ø‰Çƒ÷Hc÷H‹tõ€H…öt$H�ZH9^HcÿHƒ|ý uŸH�ý ÿÿÿHëë›f�H‹\Í L‹cH˜H‹DÅ�L‹xH‹E H…ÀH‰…þÿÿtM‰åL+hL(H‹E�M‰þL+pLpë�I‹AI‹I0M‰åI)ÍIÅM‰þI)ÎIÆL‰mÀL‰u°H‹E¨H…ÀH‰… þÿÿL‰¥PþÿÿL‰½`þÿÿt L+`L H‹E˜L+xLxëf.„�I‹A I‹I0I)ÌIÄI)ÏIÇL‰eÈL‰}¸¿pè:$H‰ÃÇHÇ@hL‰hL‰pL‰`L‰x H‹…PþÿÿH‰C(H‹…`þÿÿH‰C0M)îIÿÆH‰�8þÿÿuHÇC8HÇCPë,f�¾L‰÷è%H‰C8¾L‰÷è%H‰CPL‹cL‹{ M)çIÿÇuH‹�8þÿÿHÇC@HÇCXë.D¾L‰ÿèÃ$H‹�8þÿÿH‰C@¾L‰ÿè«$H‰CXL‹s0L+s(IÿÆu:H�CHH‰…(þÿÿHÇCHH�C`H‰…HþÿÿHÇC`1ÀHƒ½þÿÿuNé3¾L‰÷èS$H�KHH‰�(þÿÿH‰CH¾L‰÷è7$H�K`H‰�HþÿÿH‰C`Hƒ½þÿÿ„êH‹�þÿÿH‹YH‰�XþÿÿL‹iI)ÝL‰éHÿÁu&H‹�XþÿÿH‹I@H…É„²H‹…HþÿÿH‹ëÆfDH+�PþÿÿH�ØH‰…`þÿÿHÁãH‹…(þÿÿHH‹…XþÿÿL‹p(L‹x8IƒÅE1äë,„K‹æJ‰ãK‹çH‹�`þÿÿJ‰áIƒÄM9å„vÿÿÿJ‹4ãH…ötÓK‹çH‹…`þÿÿJ;à… K‹<æè¥*…ÀtÈé f.„f�H‹… þÿÿH‰ÁH…À…qL‹�8þÿÿL‰ÈHƒÀhH‰…èýÿÿH‹…PþÿÿHÁàAºI)ÂL‹�þÿÿE1öL‰•@þÿÿë�L‹� þÿÿM…öA¾…ÚN‹dõÀN‹|õ°IƒÇ1Àf.„I� L‰úM…ÛtI‹H9Ñ},I‹IHH‹ ÁK‹Tñ8H‰ ÂI‹I`H‹ ÁK‹TñPH‰ ÂHƒÀëÄ@M…Ût‹¸L)àH‰…PþÿÿJ�å¹H)ÁH‰�(þÿÿL‰¥þÿÿL‰½HþÿÿëDI‰ûH…ÿ„DÿÿÿM‹;I‹KI‰ÍM)ýL‰èHÿÀ„»M)çIÁçK‹DñPLøH‰…`þÿÿO|ñ8I‹C H‰…XþÿÿL‰�0þÿÿI‹[0IƒÅE1äë(�H‹…XþÿÿJ‹àK‰çJ‹ãH‹�`þÿÿJ‰áIƒÄM9åt9K‹4çH…ötÐJ‹ãH‹…`þÿÿJ;à…R
H‹…XþÿÿJ‹<àèÛ(…ÀtÅé9
f�L‹�0þÿÿI‹KL‹�8þÿÿL‹•@þÿÿL‹¥þÿÿI‹CH‹•PþÿÿL�
H‹•(þÿÿH� ÊI�Â1öL‹½Hþÿÿf„I�0I‹{@L‰øH…ÿtH‹L)àH9Ã�ÑþÿÿI‹AHHÐH‹ðK‹|ñ8HÏH‰÷I‹A`HÐH‹ðK‹|ñPHÏH‰÷HƒÆë­f.„H‹�XþÿÿH‹I@H…É„�ýÿÿH‹YH‰�XþÿÿL‹iI)ÝL‰èHÿÀtÒH+�PþÿÿHÁãH‹…HþÿÿH‹HØH‰…`þÿÿH‹…(þÿÿHH‹…XþÿÿL‹p(L‹x8IƒÅE1äë%�K‹æJ‰ãK‹çH‹�`þÿÿJ‰áIƒÄM9å„lÿÿÿJ‹4ãH…ötÓK‹çH‹…`þÿÿJ;à…ÕK‹<æèe'…ÀtÈéÃf.„f�1ÛH‹…þÿÿH…À”ÃÃH…À„xøÿÿHƒ½ þÿÿ„jøÿÿM‹qM+qI‹A I+A»I9Æ…LøÿÿM‹y8I‹A@H‰…`þÿÿI‹APH‰…XþÿÿM‹iXIƒÆE1ä@M9æ„øÿÿK‹<çH…ÿ„øÿÿH‹…`þÿÿJ‹4àH…ö„ò÷ÿÿH‹…XþÿÿJ‹àK;Tå…Ü÷ÿÿè›&IƒÄ…Àt³éÊ÷ÿÿH‹…øýÿÿH‰…`þÿÿ€=L…Y€=òKL‹µþÿÿH‹�ðýÿÿ…»I‹<ÞH‹�Ô¾ èS&H…À„KH‹ƒÔL‹5lÔHƒ½`þÿÿ„8H‹…PÿÿÿH‰…þÿÿH‹…XÿÿÿH‰…þÿÿH‹…`ÿÿÿH‰… þÿÿHc…tÿÿÿH‰…HþÿÿHc…xÿÿÿH‰…XþÿÿHc…|ÿÿÿH‰…8þÿÿE1íÇ…@þÿÿH‹…`þÿÿë@H‹…`þÿÿH‹@hH…À„ÎH‰…`þÿÿ‹ƒø…j€=KuѸÐ H‰…þÿÿÇ…0þÿÿŠçJ‰…PþÿÿH‹…`þÿÿH‹@I÷ÕH‰…(þÿÿIÅM…í�x€½Pþÿÿ„8ƒ½0þÿÿL‹­`þÿÿuy¾, L‰÷H‹•þÿÿ1Àè+%H‹•HþÿÿH‰ÐHÁàI‹LI;L|IN�<(IƒÇIÇÄÿÿÿÿf�I‹DÕ8I‹LÕPJ‹|àJ‹Tá¾L‰ñèï$H‹•HþÿÿI‹I+GøIƒÄI9Ä|È€="J„ƒL‰÷H‹µþÿÿH‹•þÿÿ1Àè£$H‹•XþÿÿH‰ÐHÁàI‹LI;L|QN�<(IƒÇIÇÄÿÿÿÿf.„I‹DÕ8I‹LÕPJ‹|àJ‹Tá¾L‰ñè_$H‹•XþÿÿI‹I+GøIƒÄI9Ä|È¿‰ ¾ºL‰ñè1$°‰…@þÿÿL‹­8þÿÿL‰èHÁàH‹µ`þÿÿH‹LH;L|PH‹�`þÿÿL�<IƒÇIÇÄÿÿÿÿf�H‹�`þÿÿJ‹Dé8J‹LéPJ‹|àJ‹Tá¾L‰ñèÈ#I‹I+GøIƒÄI9Ä|È€½Pþÿÿt¾6 L‰÷H‹• þÿÿ1Àè‰#H‹…`þÿÿL‹xL+xL‹­(þÿÿMýM…ÿyé–ýÿÿfDƒø
tM‹C�Hÿ‰K…À~H‹H�HH‰ ƒøÿuÜëf.„H‰ßèH#ƒøÿuÿC¨@…¨ t¸éI�GÿM…ÿI‰Ç§é-ýÿÿf.„IƒÿŒˆýÿÿM‰ïIƒÅÿë f.„I‹H�HI‰Dˆ Aƒü