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

104 lines
29 KiB
Plaintext
Raw Normal View History

ELF >À9@(m@8 @@@@hh¨¨´)´)À)À9À9p;p;0e0…0…hh˜i˜™˜™È0аg°‡°‡��Råtd0e0…0…hhPåtdä#ä#ä#ôôQåtdÀÀÀHH/libexec/ld-elf.so.1FreeBSDÚFreeBSDFreeBSD%*"9 M_iu|ƒ�•œ£ª±ÂÇÎÓÜäëó '16<BHPU\bkz�‰�—§²¾ÊÔÛáèí`› ˜™ò°(züµ(z¶(z8À8¦Ý£k½Pvž::
7
*#- 1%)03958"(4'+/,   $.&26!environ__prognameatexit_init_tlsexit__cxa_finalize_Jv_RegisterClasses__stack_chk_guardsetlocalegetopt_longoptargprintf__stdoutp__swbuffcloseoptindmemcpystrcmp__stack_chk_failstatsignalbcmp__stdinpfreopenfwritefprintffwrite_unlockedfputc__srgetabort__errorstrncmp__stderrppipevforkclosefstatwaitpiddup2execvp_exitvfprintffputs_unlockedmallocreallocmemsetcallocfflush_unlockedstrerror_rsigaltstacksigemptysetsigactionstrlenwritegetpidkillreadlibc.so.7FBSD_1.0FBSD_1.5FBSD_1.6X…°<`…Q€…x …©À…à…â†ù †q@†ü`†
€†d † À†^à†w ‡^(‡„0‡¦8‡@‡H‡ÊP‡ X‡˜`‡÷ h‡^p‡Gx‡[€‡Çˆ‡½�‡ ˜‡v ‡¬@‰°‡˜™  ™ ™¨™P°™” X‰`‰h‰p‰ x‰ €‰ˆ‰�‰Ø™à™è™ð™ø™ššš
š š
(š0š8š@šHšPšXš`šhšpšxš€šˆš�š˜š š ¨š!°š"¸š#Àš$Èš%К&Øš'àš(èš)ðš*øš+›,›-›.›/ ›0(›10›28›3@›4H›5P›6X›7read 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ÏÏÏÏÏÏÏÏÏÏÏÏÏœÏÏφÏÏÏÏÏϳÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏõÏÏÏ�ÏÏÏÏÏÏ“ÏÏÏÏÏÏÏÏîÏåEuD
D8DADJDSD\DeDnDmemory exhausted;ðü Ì7< 8dL8„|8¤¬8ÄÌ>ô B$CTÜD„|E´¼EÔìEü F$<FL\FtÌFœ GÄ<Gì\GœGDœHt|I¤üJܼKÌK$ìKD¬LlLMœzRx �,èÉA†C
PƒŒ�Ž�« A $Lˆ67A†C
Z A t 6;A†C
”À6!A†C
´Ð6+A†C
Bƒ,Ôà6A†C
MƒŒ�Ž�m A ,Ð<2A†C
PƒŒ�Ž�i A ,4à?
A†C
FƒŽ�ó A ,dÀ@ÀA†C
KƒŒŽ�¦ A ,”PB—A†C
Hƒ… A ÄÀB7A†C
$äàB$A†C
Z A $ èBA†C
K A $4àB'A†C
] A $\èBA†C
K A $„àBfA†C
\ A $¬(C<A†C
r A $Ô@C+A†C
Bƒ[ E $üHCA†C
S A ,$@C1A†C
CƒŽ` E ,TPCA†C
NƒŒŽ�è A ,„ DßA†C
PƒŒ�Ž�½ A 4´ÐDuA†C
PƒŒ�Ž�+ A $ìF¸A†C
GƒŽ§ A °FA†C
A 4 FA†C
$T F»A†C
FƒŽ�,|8G•A†C
JƒŒ�Ž�† ,¬¨GˆA†C
d A ^ UH‰åAWAVAUATSHƒìI‰þH‹HcÃL�<ÇIƒÇH�waHƒ8uL‰8IƒÆ…Û~*I‹H…Àt"H�
�_€H‰HƒÀ¶Pÿ€ú/tð„ÒuïHƒ=Ot
H‰÷èê7ë{L‰}ÐH‰]ÈL‹-OL;-OsVL‹%ùNë€IƒÅM9ås=¸¢‰×‰Î1À¢»¹ƒør 1ɸ¢Aƒ}%uÉM‹}‰ÚAÿUI‰ëºè…7H‹]ÈL‹}ЉßL‰öL‰úè ‰ßL‰öL‰úè‰Çèl7f.„f�UH‰åAWAVAUATSPHƒ=JN…åI‰ÖI‰÷A‰üH�=äè7L�-¨þÿÿH�
¡þÿÿL)éH�AH…ÉH‰ÊHHÐHÁút;H…ÉHIÁHÁøHƒø»HCØë
IƒÅHƒÃÿtI‹EHƒørìD‰çL‰þL‰òÿÐëßèv6L�-ÛIH�
ÜIL)éH�AH…ÉH‰ÊHHÐHÁútFH…ÉHIÁHÁøHƒø»HCØëf.„�IƒÅHƒÃÿtI‹EHƒørìD‰çL‰þL‰òÿÐëßHƒÄ[A\A]A^A_]ÃUH‰åAVSL�5ÂýÿÿH�»ýÿÿL)ðH�XH…ÀH‰ÁHHËHÁùu [A^]é×5H…ÀHIØHÁûëf.„@H…Ût×I‹DÞøHƒÃÿHƒørìÿÐëèÌÌÌÌÌÌÌÌUH‰åSPHƒ=êLt H‹=)]èÔ5H�ÅHf.„H‹H�HHƒùrÿÐHƒÃëëHƒÄ[]Ã@UH‰åHƒ=¤LtHƒ=ŠHt
H�=�H]é‹5]ÃÌÌÌÌÌÌÌÌÌUH‰åAWAVAUATSH�ìøI‰ö‰ûH‹hLH‹H‰EÐH�ª\ÇH‹H‰J^H�5óâÿÿE1í1ÿèA51ÿèª1L�%#HL�=üãÿÿÇ…`þÿÿëÆ^f„‰ßL‰öH��ÚÿÿL‰áE1Àè 5=ÿ"ƒÀƒøy‡…Ic‡LøÿàÆÚ]AƒÅëÀ=„¢=…­Æ»]ë¡Æ­]Æ¥]AƒÅë�Æœ]ë„ÆŽ]ƈ]AƒÅémÿÿÿ‹•`þÿÿƒú�ÿH‹gKH‹Hcʃ‰•`þÿÿH‰„ÍPÿÿÿé;ÿÿÿÆG]AƒÅé+ÿÿÿÆ4]éÿÿÿÆ/]éÿÿÿH‹KH‹H‰J[éýþÿÿ=…¡H‹5ó\H�=ËÚÿÿ1Àè
4H�=õÛÿÿH�5Ñàÿÿ1Àèø3H�5¿ßÿÿH�‚HL‹5ËJL�=UÝÿÿë f.„L‰ÿ1ÀèÆ3H‹3HƒÃH…öt0€>uåI‹6‹F �Hÿ‰N …À~H‹H�HH‰Æ
ëп
èœ3ëÄH�=àÿÿH�5]×ÿÿH�qÛÿÿH�
sÙÿÿ1Àèg3I‹>ë3H‹CJH‹;H�5ÙÿÿH�ÜØÿÿH�
ûØÿÿL�IØÿÿE1É1Àèb)H‹;öG@…¦è@3…À…¥H‹éIH‹H;EÐ…�1ÀH�Äø[A\A]A^A_]ÃD¶=Î[E‰üA÷ÔE…å•Á[D‰é÷ÑD!ù
«[¥[ Ȉ�[AƒýŠ
”[D ùu