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

104 lines
29 KiB
Plaintext
Raw Normal View History

ELF >À9@(m@8 @@@@hh¨¨´)´)À)À9À9p;p;0e0…0…hh˜i˜™˜™È°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(10283@4H5P6X7read 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 ,èÉAC
ŒŽ« A $Lˆ67AC
Z A t 6;AC
À6!AC
´Ð6+AC
,Ôà6AC
ŒŽm A ,Ð<2AC
ŒŽi A ,4à?
AC
Žó A ,dÀ@ÀAC
ŒŽ¦ A ,PBAC
 A ÄÀB7AC
$äàB$AC
Z A $ èBAC
K A $4àB'AC
] A $\èBAC
K A $àBfAC
\ A $¬(C<AC
r A $Ô@C+AC
[ E $üHCAC
S A ,$@C1AC
Ž` E ,TPCAC
ŒŽè A , DßAC
ŒŽ½ A 4´ÐDuAC
ŒŽ+ A $ìF¸AC
ާ A °FAC
A 4 FAC
$T F»AC
Ž,|8GAC
ŒŽ ,¬¨GˆAC
d A ^ UH‰åAWAVAUATSHƒìI‰þHHcÃL<ÇIƒÇHwaHƒ8uL‰8IƒÆ…Û~*IH…À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.fUH‰åAWAVAUATSPHƒ=JN…åI‰ÖI‰÷A‰üHè7L-¨þÿÿH
¡þÿÿL)éHAH…ÉH‰ÊHHÐHÁút;H…ÉHIÁHÁøHƒø»HCØë
IƒÅHƒÃÿtI‹EHƒørìD‰çL‰þL‰òÿÐëßèv6L-ÛIH
ÜIL)éHAH…ÉH‰ÊHHÐHÁútFH…ÉHIÁHÁøHƒø»HCØëf.IƒÅHƒÃÿtI‹EHƒørìD‰çL‰þL‰òÿÐëßHƒÄ[A\A]A^A_]ÃUH‰åAVSL5ÂýÿÿH»ýÿÿL)ðHXH…ÀH‰ÁHHËHÁùu [A^]é×5H…ÀHIØHÁûëf.@H…Ût×I‹DÞøHƒÃÿHƒørìÿÐëèÌÌÌÌÌÌÌÌUH‰åSPHƒ=êLt H=)]èÔ5HÅHf.H‹HHHƒùrÿÐHƒÃëëHƒÄ[]Ã@UH‰åHƒ=¤LtHƒ=ŠHt
H=H]é‹5]ÃÌÌÌÌÌÌÌÌÌUH‰åAWAVAUATSHìøI‰ö‰ûHhLH‹H‰EÐHª\ÇHH‰J^H5óâÿÿ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=õÛÿÿH5Ñàÿÿ1Àèø3H5¿ßÿÿH‚HL‹5ËJL=UÝÿÿë f.L‰ÿ1ÀèÆ3H3HƒÃH…öt0€>uåI6F Hÿ‰N …À~HHHH‰Æ
ëп
èœ3ëÄH=àÿÿH5]×ÿÿHqÛÿÿH
sÙÿÿ1Àèg3I>ë3HCJH;H5ÙÿÿHÜØÿÿH
ûØÿÿLIØÿÿ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