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 : : dhhˆhˆ˜ˆ˜À f † †Råtd dhhPåtd¤#¤#¤#ôôQåtdÀÀÀHH/libexec/ld-elf.so.1FreeBSDñÝFreeBSDFreeBSD%*"9 M_iu|ƒœ£ª±ÂÇÎÓÜäëó '16<BHPU\bkz «·ÃÍÔÚáæ ˆ˜ë°(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„8i°„ÎЄ¢ð„¹10…¼P…Íp…$̰…Ð…7Df(†Ü0†Ö8†Š@†ØH†XP†· X†`†h†p†x†}€†Øˆ†6l †ˆ˜Ø˜˜˜˜ ˜T Hˆ`ˆ hˆ €ˆȘИؘà˜è˜ð˜ø˜
 
(™0™8™@™H™P™X™`™h™p™x™€™ˆ™ ˜™! ™"¨™#°™$¸™%À™&È™'Й(Ø™)à™*è™+ð™,ø™-š.š/š0š1 š23456read 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ˆCCšC£C¬CµC¾Cmemory exhaustedü ¼7<ü7d<8l8¤œ8Ä>ô\A$lBT,DÌD´ EÔ<Eü\E$ŒEL¬EtFœ\FÄ|FìœFÜFDÜGt¼H¤<JÜüJ K$,KDìKlŒLœzRx ,è²AC
ŒŽ« A $Lx67AC
Z A t6;AC
°6!AC
2023-05-01 21:01:54 -04:00
´À6+AC
,ÔÐ6tAC
ŒŽÇ A , <2AC
ŒŽi A ,40?
2023-05-01 21:01:54 -04:00
AC
Žó A ,d@ÀAC
ŒŽ¦ A , AAC
 A ÄB7AC
$ä0B$AC
Z A $ 8BAC
K A $40B'AC
] A $\8BAC
K A $0BfAC
\ A $¬xB<AC
r A $ÔBAC
S A $üˆBAC
S A ,$€B1AC
Ž` E ,TBAC
2023-05-01 21:01:54 -04:00
ŒŽè A ,`CßAC
ŒŽ½ A 4´DuAC
ŒŽ+ A $ìXE¸AC
ާ A ðEAC
2023-05-01 21:01:54 -04:00
A 4àEAC
$TàE»AC
Ž,|xFAC
2023-05-01 21:01:54 -04:00
ŒŽ ,¬èFˆAC
d A ^ UH‰åAWAVAUATSHƒìI‰þHHcÃL<ÇIƒÇH§`Hƒ8uL‰8IƒÆ…Û~*IH…À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.fUH‰åAWAVAUATSPHƒ=zM…åI‰ÖI‰÷A‰üHèO6L-¨þÿÿH
¡þÿÿL)éHAH…ÉH‰ÊHHÐHÁút;H…ÉHIÁHÁøHƒø»HCØë
IƒÅHƒÃÿtI‹EHƒørìD‰çL‰þL‰òÿÐëßè¶5L- 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=Y\è5HõGf.H‹HHHƒùrÿÐHƒÃëëHƒÄ[]Ã@UH‰åHƒ=ÔKtHƒ=ºGt
H=±G]éË4]ÃÌÌÌÌÌÌÌÌÌUH‰åAWAVAUATSHìøI‰ö‰ûH˜KH‹H‰EÐHÚ[ÇHH‰z]H5óâÿÿ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=õÛÿÿH5Ñàÿÿ1Àè83H5¿ßÿÿH²GL5ûIL=UÝÿÿë f.L‰ÿ1Àè3H3HƒÃH…öt0€>uåI6F Hÿ‰N …À~HHHH‰Æ
ëп
2023-05-01 21:01:54 -04:00
èÜ2ëÄH=àÿÿH5]×ÿÿHqÛÿÿH
sÙÿÿ1Àè§2I>ë3HsIH;H5ÙÿÿHÜØÿÿH
ûØÿÿLIØÿÿE1É1Àè²(H‹;öG@…£è€2…À…¢H‹IH‹H;EÐ…š1ÀHÄø[A\A]A^A_]ÃD¶=þZE‰üA÷ÔE…åñZD‰é÷ÑD!ù
ÛZÕZ ȈÍZAƒýŠ