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

101 lines
28 KiB
Plaintext
Raw Normal View History

2025-09-04 08:48:14 -06:00
ELF >`9@@h@8 @ @@@hh¨¨T)T)`)`9`977```€`€P °d°”°”¸àbà‚à‚Råtd```€`€P Påtd4#4#4#QåtdÀÀÀHH/libexec/ld-elf.so.1FreeBSDdFreeBSDFreeBSD""1 EWamt{¢©®µºËÔÜãëû$.39?EMRY_hw~¨´ÀÊÑ×Þã°”p–è°(zòµ(zû¶(z·(z
6À6¼Pvž§Ý£k88$.46 &2('
*57-)"1%,!+/
#03 __libc_start1__prognameenviron__cxa_finalize_Jv_RegisterClasses__stack_chk_guardsetlocalegetopt_longoptargprintf__stdoutp__swbuffcloseoptindmemcpystrcmpstatsignalbcmp__stack_chk_fail__stdinpfreopenfwritefprintffwrite_unlockedfputcexit__srgetabort__errorstrncmp__stderrppipevforkclosefstatwaitpiddup2execvp_exitvfprintffputs_unlockedmallocrealloccallocfflush_unlockedstrerror_rsigaltstacksigemptysetsigactionstrlenwritegetpidkillreadlibc.so.7FBSD_1.0FBSD_1.5FBSD_1.6FBSD_1.7ˆ€à9°€kЀuð€ˆì0PKp><° ÐðEcP)X
`‚ h5p‚´x‚Ѐ‚ùˆ‚QH˜‚¤ ‚J¨‚ñ°‚.¸‚qÀ‚ùÈ‚§Ђz°”ù¸”¸”À”©È”p„x„€„ˆ„ ˜„  „¨„ð”ø”
(• 0•
8•@•H•P•X•`•h•p•x•€•ˆ•˜• •¨•°•¸• À•!È•"Е#Ø•$à•%è•&ð•'ø•()*+, -(.0/80@1H2P3X4`5incompatible options%ld,%ldc
%ld,%ldd
/usr/bin/diff%d:Compare three files line by line.=======
%ld,%lds/^\.//
Written by %s and %s.
Written by %s, %s, %s,
%s, %s, and %s.
-x --overlap-only Output overlapping changes.%ldc
easy-onlyed %s
%s:%d: GNU diffutilsstandard output-i Append `w' and `q' commands to ed scripts.pipeNo newline at end of file%s %s
Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE
-e --ed Output unmerged changes from OLDFILE to YOURFILE into MYFILE.--diff-program=PROGRAM Use PROGRAM to compare files.-v --version Output version info.%lda
<<<<<<< %s
Written by %s.
initial-tabwrite failedsubsidiary program `%s' not found%ldd
Exit status is 0 if successful, 1 if conflicts, 2 if trouble.fstatThis is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
close%lda
Randy Smithmissing operand after `%s'show-alltext-a --text Treat all files as text.====%s
%s--help Output this help.subsidiary program `%s' could not be invokedstack overflow-3 --easy-only Output unmerged nonoverlapping changes.--horizon-lines=100 internal error: invalid diff type passed to output.
aeimvx3AEL:TXversion-aWritten by %s, %s, %s,
%s, %s, %s, %s,
and %s.
%s
invalid diff format; invalid change separatorinvalid diff format; incorrect leading line chars`-' specified for more than one input file-T --initial-tab Make tabs line up by prepending a tab.invalid diff format; incomplete last lineTry `%s --help' for more information.subsidiary program `%s' failed<<<<<<< %s
program error--strip-trailing-cr Strip trailing carriage return on input.subsidiary program `%s' failed (exit status %d)input file shrankUnknown system error
helpIf a FILE is `-', read standard input.-X Output overlapping changes, bracketing them.%s:%lds/^\.//
r--waitpid label%s (%s) %s
Written by %s, %s, %s,
and %s.
Written by %s, %s, %s,
%s, and %s.
Written by %s, %s, %s,
%s, %s, %s, %s,
%s, and %s.
-strip-trailing-cr
%s
%s
%s
---
--strip-trailing-cr: %sdiff3read failedinternal error: screwup in format of diff blocks%s: diff failed: too many file label optionsoverlap-onlymerge-m --merge Output merged file instead of ed script (default -A).Copyright (C) 2004 Free Software Foundation, Inc.%s: 2.8.7
\ %s
>>>>>>> %s
Written by %s, %s, %s,
%s, %s, %s, and %s.
: diff-programReport bugs to <bug-gnu-utils@gnu.org>.-L LABEL --label=LABEL Use LABEL instead of file name.||||||| %s
extra operand `%s'-A --show-all Output all changes, bracketing conflicts.forkw
q
Written by %s, %s, and %s.
show-overlap-E --show-overlap Output unmerged changes, bracketing conflicts.Written by %s, %s, %s,
%s, %s, %s, %s,
%s, %s, and others.
@¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸¸3¸¸¸¸¸¸¸¸¸¸¸¸¸z¸¸¸e¸¸¸¸¸¸¸¸¸¸¸¸¸Ü¸¸¸^¸¸¸¸¸¸¸¸Ð¸¸¸l¸¸¸ñ¸¸¸q¸¸¸¸¸¸¸¸Î¸ÁA@`@N@<@3@i@r@W@E@memory exhausted;!,,\L¬pÜœœ4ÌÜ4ð5 L5(|5DÌ:tü=¤?ÌÜ@ø|A$¼A@ìAd Bˆ<B¬\BÐÌBô C,C<LC`ŒCŒœD¸|EèüF¼GDÌGdìG¬H¤LIÐÜIüzRx ø.AC†
 <LAC
E (`4'AC
\ E A ,Œ8¿AC
ŒŽ« A  ¼È27AC
Z A àä2;AC
ü3!AC
3+AC
,403JAC
ŒŽµ A ,dP8,AC
ŒŽc A $P;AC
Ž A (¼H<¸AC
ŒŽž A (èÜ=AC
 A P>7AC
 0t>$AC
Z A  T€>AC
K A  x|>'AC
] A  œˆ>AC
K A  À„>gAC
] A  äÐ><AC
r A  ì>AC
S A  ,è>AC
S A (Pä>1AC
Ž` E (|ø>AC
ŒŽê A ,¨Ü?ÞAC
ŒŽ½ A 0ØŒ@uAC
ŒŽ+ A $ ØA¸AC
ާ A 4pBAC
A T`BAC
 pdB·AC
Ž(CAC
ŒŽ (ÀtCŠAC
e A _ ìØC,AC
e UH‰åH‰ñH‰þHƒÆH‰úHƒÂHc‰ÇHÁàHÂLˆèã3ÌÌÌUH‰åSPHƒ=ÒJt H=[èÔ3HÅFffff.HHHHƒùrÿÐHƒÃëëHƒÄ[]Ã@UH‰åHƒ=ŒJtHƒ=ŠFt
H=F]é‹3]ÃÌÌÌÌÌÌÌÌÌUH‰åAWAVAUATSHìH‰óA‰þHOJH‹H‰EÐHZÇHH‰)\H5£ÜÿÿE1í1ÿè@31ÿèÉ/L%"FL=æÿÿÇ…XþÿÿëÆý[D‰÷H‰ÞH¸ßÿÿL‰áE1Àè3=ÿ ÿÀƒøy‡ŽIc‡LøÿàÆº[AÿÅëÁ=„ž=…©Æœ[ë¢ÆŽ[Ɔ[AÿÅëÆ~[ë†Æp[Æj[AÿÅépÿÿÿ‹•Xþÿÿƒú H‹RIH‹HcÊÿ‰•XþÿÿH‰„ÍPÿÿÿé?ÿÿÿÆ+[AÿÅé0ÿÿÿÆ[é$ÿÿÿÆ[éÿÿÿH‹ IH‹H‰7Yéÿÿÿ=…¯H‹5ØZH=SÛÿÿ1Àè2H=éÞÿÿH5ÿÙÿÿ1Àèý1H5_ÛÿÿL=‡FL5¸HH™Úÿÿë%ffffff.H‰ß1ÀèÆ1I7IƒÇH…öt0€>uåI6F Hÿ‰N …À~HHHH‰Æ
ëп
èœ1ëÄH=fáÿÿH5IàÿÿHâÛÿÿH
Îâÿÿ1Àèg1I>ë3H+HH;H5^áÿÿHÚÿÿH
NâÿÿL‘ÜÿÿE1É1Àè‚'H‹;öG@ è@1…À H‹ÑGH‹H;EÐ 1ÀHÄ[A\A]A^A_]ÃD¶=®YA¶ÇA‰ÄA÷ÔE…åYD‰é÷щÊD ú…Y}Y ȈuYAƒý
kYD ùu
ƒ½Xþÿÿt)…Àu%H=MØÿÿ1öèÖH=áàÿÿ1öèÈ1ÿ1öè¿H‹@GHcD‰ñ)Áƒù…¶H ÃH‰(þÿÿƒ½Xþÿÿ0‹•XþÿÿHcÊH<ÍPÿÿÿHïHÃH4ȸ)ÐHÅèC0E…å•ÀAÇA¶ÇA¾A)ÆH‹(þÿÿJ<óH5ºßÿÿè&0H…ÀuXH5§ßÿÿH‰ßè0…ÀtAƒöH‹…(þÿÿJ‹<ðH5…ßÿÿèñ/…Àu&H=éÜÿÿè1« IcÆH‹tÃøH=íÚÿÿè×Ç…tÿÿÿD‰ðƒð‰…xÿÿÿD‰µ|ÿÿÿÇ…hÿÿÿH‰…þÿÿÇ„…hÿÿÿD‰ðH‰…@þÿÿÇ„…hÿÿÿH5ßÿÿH‰ßèj/…À…C H‹…(þÿÿH‹XH5ßÞÿÿH‰ßèH/…À…r H‹…(þÿÿHXH5½ÞÿÿH‰ßè&/…ÀtPH‹…(þÿÿLpHµpþÿÿH‰ßè/…ÀˆP ·…ˆþÿÿ%ð=@uI‹HZÚÿÿ¿¾1Àè’'1ÀH‰…`þÿÿ¿1öèÝ.Hc…pÿÿÿL‹¥(þÿÿI‹ÄHc…lÿÿÿI‹<ÄL½hþÿÿH‰ÞL‰úè>I‰ÆHc…hÿÿÿH‰…èýÿÿI‹<ÄH‰ÞL‰úèHÇ…ØýÿÿH‰E€L‰uˆL‰ñH Á HØýÿÿH‰àýÿÿH