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.1FreeBSD�dFreeBSDFreeBSD""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ð€ˆ�ì0�P�Kp�>��<°� Ð�‘ð�E‚cP‚)X‚
`‚ h‚5p‚´x‚Ѐ‚ùˆ‚Q�‚H˜‚¤ ‚J¨‚ñ°‚.¸‚qÀ‚ùÈ‚§Ђz°”ù¸”¸”À”©È””p„x„€„ˆ„�„ ˜„  „¨„ð”ø”•••• •
(• 0•
8•@•H•P•X•`•h•p•x•€•ˆ•�•˜• •¨•°•¸• À•!È•"Е#Ø•$à•%è•&ð•'ø•(–)–*–+–, –-(–.0–/8–0@–1H–2P–3X–4`–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†
 <LA†C
BƒE (`4'A†C
\ E A ,Œ8¿A†C
PƒŒ�Ž�« A  ¼È27A†C
Z A àä2;A†C
ü3!A†C
3+A†C
Bƒ,403JA†C
MƒŒ�Ž�µ A ,dP8,A†C
PƒŒ�Ž�c A $”P;A†C
CƒŽ A (¼H<¸A†C
KƒŒŽ�ž A (èÜ=—A†C
Hƒ… A P>7A†C
 0t>$A†C
Z A  T€>A†C
K A  x|>'A†C
] A  œˆ>A†C
K A  À„>gA†C
] A  äÐ><A†C
r A  ì>A†C
S A  ,è>A†C
S A (Pä>1A†C
CƒŽ` E (|ø>A†C
NƒŒŽ�ê A ,¨Ü?ÞA†C
PƒŒ�Ž�½ A 0ØŒ@uA†C
PƒŒ�Ž�+ A $ ØA¸A†C
GƒŽ§ A 4pBA†C
A T`BA†C
 pdB·A†C
FƒŽ�(”C‘A†C
JƒŒ�Ž�‚ (ÀtCŠA†C
e A _ ìØC,A†C
Bƒe UH‰åH‰ñH‰þHƒÆH‰úHƒÂHc‰ÇHÁàHÂL�ˆèã3ÌÌÌUH‰åSPHƒ=ÒJt H‹=[èÔ3H�ÅFffff.„H‹H�HHƒùrÿÐHƒÃëëHƒÄ[]Ã@UH‰åHƒ=ŒJtHƒ=ŠFt
H�=�F]é‹3]ÃÌÌÌÌÌÌÌÌÌUH‰åAWAVAUATSH�ìH‰óA‰þH‹OJH‹H‰EÐH�‘ZÇH‹H‰)\H�5£Üÿÿ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�=éÞÿÿH�5ÿÙÿÿ1Àèý1H�5_ÛÿÿL�=‡FL‹5¸HH�™Úÿÿë%ffffff.„H‰ß1ÀèÆ1I‹7IƒÇH…öt0€>uåI‹6‹F �Hÿ‰N …À~H‹H�HH‰Æ
ëп
èœ1ëÄH�=fáÿÿH�5IàÿÿH�âÛÿÿH�
Îâÿÿ1Àèg1I‹>ë3H‹+HH‹;H�5^áÿÿ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�ÃH�4ȸ)ÐH�ÅèC0E…å•ÀAÇA¶ÇA¾A)ÆH‹�(þÿÿJ‹<óH�5ºßÿÿè&0H‹…ÀuXH�5§ßÿÿH‰ßè0…ÀtAƒöH‹…(þÿÿJ‹<ðH�5…ßÿÿèñ/…Àu&H�=éÜÿÿè1�« IcÆH‹tÃøH�=íÚÿÿè×Ç…tÿÿÿD‰ðƒð‰…xÿÿÿD‰µ|ÿÿÿÇ…hÿÿÿH‰…þÿÿÇ„…hÿÿÿD‰ðH‰…@þÿÿÇ„…hÿÿÿH�5ßÿÿH‰ßèj/…À…C H‹…(þÿÿH‹XH�5ßÞÿÿH‰ßèH/…À…r H‹…(þÿÿH‹XH�5½ÞÿÿH‰ßè&/…ÀtPH‹…(þÿÿL�pH�µpþÿÿH‰ßè/…ÀˆP ·…ˆþÿÿ%ð=@uI‹H�ZÚÿÿ¿¾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�