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

101 lines
29 KiB
Plaintext
Raw Normal View History

2023-05-01 21:01:54 -04:00
ELF >€9@l@8 @@@@hh¨¨t)t)€)€9€9 : : d „ „hhˆhˆ˜ˆ˜À0Š f † †��Råtd d „ „hhPåtd¤#¤#¤#ôôQåtdÀÀÀHH/libexec/ld-elf.so.1FreeBSDñÝFreeBSDFreeBSD%*"9 M_iu|ƒ�•œ£ª±ÂÇÎÓÜäëó '16<BHPU\bkz�‰� «·ÃÍÔÚáæPš ˆ˜ë°(zõµ(zþ¶(z7À7¦Ý£k½Pvž99# -"7/
14+
86*(3%5.$)2 '! & ,0environ__prognameatexit_init_tlsexit__cxa_finalize_Jv_RegisterClasses__stack_chk_guardsetlocalegetopt_longoptargprintf__stdoutp__swbuffcloseoptindmemcpystrcmp__stack_chk_failstatsignalbcmp__stdinpfreopenfwritefprintffwrite_unlockedfputc__srgetabort__errorstrncmp__stderrppipevforkclosefstatwaitpiddup2execvp_exitvfprintffputs_unlockedmallocrealloccallocfflush_unlockedstrerror_rsigaltstacksigemptysetsigactionstrlenwritegetpidkillreadlibc.so.7FBSD_1.0FBSD_1.5FBSD_1.6H„p<P„p„8�„i°„ÎЄ¢ð„¹…10…¼P…Íp…$�…̰…Ð…7††D †f(†Ü0†Ö8†Š@†ØH†XP†· X†`†h†p†‡x†}€†Øˆ†6�†l0ˆ †ˆ˜Ø�˜�˜˜˜ ˜T HˆPˆXˆ`ˆ hˆ pˆxˆ€ˆȘИؘà˜è˜ð˜ø˜™
™ ™
™ ™(™0™8™@™H™P™X™`™h™p™x™€™ˆ™�™ ˜™! ™"¨™#°™$¸™%À™&È™'Й(Ø™)à™*è™+ð™,ø™-š.š/š0š1 š2(š30š48š5@š6read 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
2023-05-01 21:01:54 -04:00
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ÏÏÏÏÏÏÏÏÏÏÏÏÏœÏÏφÏÏÏÏÏϳÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏÏõÏÏÏ�ÏÏÏÏÏÏ“ÏÏÏÏÏÏÏÏîÏågDÅCZCˆC‘CšC£C¬CµC¾Cmemory exhausted;ðü ¼7<ü7d<8„l8¤œ8Ä>ô\A$lBT,D„ÌD´ EÔ<Eü\E$ŒEL¬EtFœ\FÄ|FìœFÜFDÜGt¼H¤<JÜüJ K$,KDìKlŒLœzRx �,è²A†C
PƒŒ�Ž�« A $Lx67A†C
Z A t�6;A†C
”°6!A†C
2023-05-01 21:01:54 -04:00
´À6+A†C
Bƒ,ÔÐ6tA†C
MƒŒ�Ž�Ç A , <2A†C
PƒŒ�Ž�i A ,40?
2023-05-01 21:01:54 -04:00
A†C
FƒŽ�ó A ,d@ÀA†C
KƒŒŽ�¦ A ,” A—A†C
Hƒ… A ÄB7A†C
$ä0B$A†C
Z A $ 8BA†C
K A $40B'A†C
] A $\8BA†C
K A $„0BfA†C
\ A $¬xB<A†C
r A $Ô�BA†C
S A $üˆBA†C
S A ,$€B1A†C
CƒŽ` E ,T�BA†C
2023-05-01 21:01:54 -04:00
NƒŒŽ�è A ,„`CßA†C
PƒŒ�Ž�½ A 4´DuA†C
PƒŒ�Ž�+ A $ìXE¸A†C
GƒŽ§ A ðEA†C
2023-05-01 21:01:54 -04:00
A 4àEA†C
$TàE»A†C
FƒŽ�,|xF•A†C
2023-05-01 21:01:54 -04:00
JƒŒ�Ž�† ,¬èFˆA†C
d A ^ UH‰åAWAVAUATSHƒìI‰þH‹HcÃL�<ÇIƒÇH�§`Hƒ8uL‰8IƒÆ…Û~*I‹H…Àt"H�
¿^€H‰HƒÀ¶Pÿ€ú/tð„ÒuïHƒ=DNt
H‰÷è*7ë{L‰}ÐH‰]ÈL‹-1NL;-2NsVL‹%)Në€IƒÅM9ås=¸¢‰×‰Î1À¢»¹ƒør 1ɸ¢Aƒ}%uÉM‹}‰ÚAÿUI‰ëºèÅ6H‹]ÈL‹}ЉßL‰öL‰úè ‰ßL‰öL‰úè‰Çè¬6f.„f�UH‰åAWAVAUATSPHƒ=zM…åI‰ÖI‰÷A‰üH�=äèO6L�-¨þÿÿH�
¡þÿÿL)éH�AH…ÉH‰ÊHHÐHÁút;H…ÉHIÁHÁøHƒø»HCØë
IƒÅHƒÃÿtI‹EHƒørìD‰çL‰þL‰òÿÐëßè¶5L�- 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‹=Y\è5H�õGf.„H‹H�HHƒùrÿÐHƒÃëëHƒÄ[]Ã@UH‰åHƒ=ÔKtHƒ=ºGt
H�=±G]éË4]ÃÌÌÌÌÌÌÌÌÌUH‰åAWAVAUATSH�ìøI‰ö‰ûH‹˜KH‹H‰EÐH�Ú[ÇH‹H‰z]H�5óâÿÿE1í1ÿè�41ÿèê0L�%SGL�=üãÿÿÇ…`þÿÿëÆN]f„‰ßL‰öH��ÚÿÿL‰áE1ÀèI4=ÿ"ƒÀƒøy‡…Ic‡LøÿàÆ
]AƒÅëÀ=„¢=…­Æë\ë¡ÆÝ\ÆÕ\AƒÅë�ÆÌ\ë„Æ¾\Ƹ\AƒÅémÿÿÿ‹•`þÿÿƒú�ÿH‹—JH‹Hcʃ‰•`þÿÿH‰„ÍPÿÿÿé;ÿÿÿÆw\AƒÅé+ÿÿÿÆd\éÿÿÿÆ_\éÿÿÿH‹LJH‹H‰zZéýþÿÿ=…¡H‹5#\H�=ËÚÿÿ1ÀèM3H�=õÛÿÿH�5Ñàÿÿ1Àè83H�5¿ßÿÿH�²GL‹5ûIL�=UÝÿÿë f.„L‰ÿ1Àè3H‹3HƒÃH…öt0€>uåI‹6‹F �Hÿ‰N …À~H‹H�HH‰Æ
ëп
2023-05-01 21:01:54 -04:00
èÜ2ëÄH�=àÿÿH�5]×ÿÿH�qÛÿÿH�
sÙÿÿ1Àè§2I‹>ë3H‹sIH‹;H�5ÙÿÿH�ÜØÿÿH�
ûØÿÿL�IØÿÿE1É1Àè²(H‹;öG@…£è€2…À…¢H‹IH‹H;EÐ…š1ÀH�Äø[A\A]A^A_]ÃD¶=þZE‰üA÷ÔE…å•ñZD‰é÷ÑD!ù
ÛZÕZ ȈÍZAƒýŠ