Xigmanas/xigmanas-bastille-extension
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity
Files
cac84dc2499604817a061cbff0a456f090136c7f
xigmanas-bastille-extension/conf/system/include/14.3/diff3
T

106 lines
28 KiB
Plaintext
Raw Normal View History

Add 'etcupdate' command, update bundled files
2025-11-17 09:05:09 -04:00
ELF >`9@Pi@8 @ @@@hh¨¨\)\)`)`9`9°7°7a��hðxex•x•¸ Š�c�ƒ�ƒ��Råtda��hðPåtd4#4#4#QåtdÀÀÀHH/libexec/ld-elf.so.1FreeBSDxhFreeBSDFreeBSD""1 EWamt{…�”›¢§®³ÄËÔÜäôü
',28>FKRXapw†–¡¨´ÀÊÑ×Þãx•0—è°(zòµ(zû¶(z·(z
6À6¼Pvž§Ý£k88#.46 %2'&
Finish adding support for 14.3
2025-09-04 08:48:14 -06:00
)57,(!1$+ -*/
"03 __libc_start1__prognameenviron__cxa_finalize_Jv_RegisterClasses__stack_chk_guardsetlocalegetopt_longoptargprintf__stdoutp__swbuffcloseoptindmemcpystatsignalbcmp__stack_chk_failfwrite__stdinpfreopenfprintffwrite_unlocked__srgetexitfputcabort__errorstrncmp__stderrppipevforkclosefstatwaitpiddup2execvp_exitvfprintffputs_unlockedmallocrealloccallocfflush_unlockedstrerror_rstrcmpsigaltstacksigemptysetsigactionstrlenwritegetpidkillreadlibc.so.7FBSD_1.0FBSD_1.5FBSD_1.6FBSD_1.78�:@�`�k€�u �ˆÀ�ìà�‚I ‚<@‚<`‚þ€‚� ‚EÀ‚cƒ)ƒ ƒžƒ5 ƒ´(ƒÐ0ƒù8ƒO@ƒFHƒ¤PƒJXƒñ`ƒ.hƒqpƒùxƒ§€ƒzx•ù€•€•ˆ•©�•’ …8…@…H…P… X… `…h…¸•À•È•ЕØ•à•è•
ð• ø•
–––– –(–0–8–@–H–P–X–`–h–p–x–€– ˆ–!�–"˜–# –$¨–%°–&¸–'À–(È–)Ж*Ø–+à–,è–-ð–.ø–/—0—1—2—3 —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,
Add 'etcupdate' command, update bundled files
2025-11-17 09:05:09 -04:00
%s, and %s.
Finish adding support for 14.3
2025-09-04 08:48:14 -06:00
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
Add 'etcupdate' command, update bundled files
2025-11-17 09:05:09 -04:00
Written by %s, %s, and %s.
show-overlap-E --show-overlap Output unmerged changes, bracketing conflicts.Written by %s, %s, %s,
Finish adding support for 14.3
2025-09-04 08:48:14 -06:00
%s, %s, %s, %s,
Add 'etcupdate' command, update bundled files
2025-11-17 09:05:09 -04:00
%s, %s, and others.
`ÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓÓSÓÓÓÓÓÓÓÓÓÓÓÓÓšÓÓÓ…ÓÓÓÓÓÓ°ÓÓÓÓÓÓÓüÓÓÓ~ÓÓÓÓÓÓÓÓðÓÓÓŒÓÓÓÓÓÓ‘ÓÓÓÓÓÓÓÓîÓáŸA”@ð@Þ@Ì@Ã@ù@Aç@Õ@memory exhausted;!,,\LÌpüœ<5Ì|5ð¼5 ì5(6Dl;tœ>¤¬?ÌlAø B$LB@|BdœBˆÌB¬ìBÐ\CôœC¼C<ÜC`DŒ,E¸ FèŒGLHD\Hd|H€<I¤ÜIÐlJüzRx �ø"AC†
 <jA†C
CƒŽb (`T'A†C
\ E A ,ŒX;A†C
PƒŒ�Ž�« A  ¼h37A†C
Z A à„3;A†C
ü¨3!A†C
¼3+A†C
Bƒ,4Ð3JA†C
MƒŒ�Ž�µ A ,dð8'A†C
PƒŒ�Ž�^ A $”ð;A†C
Finish adding support for 14.3
2025-09-04 08:48:14 -06:00
CƒŽü A (¼Ø<¸A†C
KƒŒŽ�ž A (èl>—A†C
Hƒ… A à>7A†C
 0?$A†C
Add 'etcupdate' command, update bundled files
2025-11-17 09:05:09 -04:00
Z A  T?A†C
Finish adding support for 14.3
2025-09-04 08:48:14 -06:00
K A  x ?'A†C
Add 'etcupdate' command, update bundled files
2025-11-17 09:05:09 -04:00
] A  œ?A†C
K A  À?gA†C
] A  ä`?<A†C
r A  |?A†C
S A  ,x?A†C
S A (Pt?1A†C
Finish adding support for 14.3
2025-09-04 08:48:14 -06:00
CƒŽ` E (|ˆ?A†C
Add 'etcupdate' command, update bundled files
2025-11-17 09:05:09 -04:00
NƒŒŽ�ê A ,¨l@ÞA†C
PƒŒ�Ž�½ A 0ØAuA†C
Finish adding support for 14.3
2025-09-04 08:48:14 -06:00
PƒŒ�Ž�+ A $ hB¸A†C
Add 'etcupdate' command, update bundled files
2025-11-17 09:05:09 -04:00
GƒŽ§ A 4CA†C
A TðBA†C
 pôB·A†C
FƒŽ�(”�C‘A†C
JƒŒ�Ž�‚ (ÀDŠA†C
e A _ $ìhDJA†C
CƒŽB UH‰åH‰ñHcH�wH�TljÇL�´èŸ4ÌÌÌÌÌÌÌÌÌÌÌÌÌÌÌUH‰åAVSHƒ=�Kt H‹=Ø[èƒ4H�tGL‹5mKL5nKfffff.„H‹H�HHƒùrM…ö•ÁL9ó“„ÑuÿÐHƒÃëÛ[A^]ÃfDUH‰åHƒ=,KtHƒ=Gt
H�=G]é4]ÃÌÌÌÌÌÌÌÌÌUH‰åAWAVAUATSH�ìøH‰óA‰þH‹ïJH‹H‰EÐH�9[ÇH‹H‰É\H�5ƒÜÿÿE1í1ÿèÐ31ÿè90L�%²FL�=ûåÿÿÇ…€þÿÿëÆ�\„D‰÷H‰ÞH�˜ßÿÿL‰áE1Àè˜3=ÿ ÿÀƒøy‡‰Ic‡LøÿàÆZ\AÿÅëÁ=„ž=…©Æ<\ë¢Æ.\Æ&\AÿÅë�Æ\ë†Æ\Æ
\AÿÅépÿÿÿ‹•€þÿÿƒú�H‹òIH‹HcÊÿ‰•€þÿÿH‰„Ípÿÿÿé?ÿÿÿÆË[AÿÅé0ÿÿÿƹ[é$ÿÿÿÆ´[éÿÿÿH‹©IH‹H‰ßYéÿÿÿ=…ªH‹5x[H�=3Ûÿÿ1Àè¢2H�=ÉÞÿÿH�5ßÙÿÿ1Àè�2H�5?ÛÿÿL�=GL‹5XIH�yÚÿÿë%ffffff.„H‰ß1ÀèV2I‹7IƒÇH…öt0€>uåI‹6‹F �Hÿ‰N …À~H‹H�HH‰Æ
Finish adding support for 14.3
2025-09-04 08:48:14 -06:00
ëп
è,2ëÄH�=DáÿÿH�5)àÿÿH�ÂÛÿÿH�
Add 'etcupdate' command, update bundled files
2025-11-17 09:05:09 -04:00
¬âÿÿ1Àè÷1I‹>ë3H‹ËHH‹;H�5<áÿÿH�ðÙÿÿH�
,âÿÿL�qÜÿÿE1É1Àèò'H‹;öG@…1 èÐ1…À…0 H‹qHH‹H;EÐ…( 1ÀH�Äø[A\A]A^A_]ÃD¶=NZE¶çE9å—CZD‰é÷щÈD ø+ZD!á"Z ȈZAƒý
ZD ùu
Finish adding support for 14.3
2025-09-04 08:48:14 -06:00
ƒ½€þÿÿt)…Àu%H�=2Øÿÿ1öè[H�=Äàÿÿ1öèM1ÿ1öèDH‹åGHcD‰ñ)Áƒù…»H� ÃH‰�Pþÿÿƒ½€þÿÿ0‹•€þÿÿHcÊH�<ÍpÿÿÿHïH�ÃH�4ȸ)ÐH�ÅèØ0E9å—ÀAÇA¶Ï¸)ÈH‹�PþÿÿH‹ ÁƒÂÓu¶QH‹�PþÿÿH‹9ƒÁÓ…ÒuR‰Ê…Éu¶W…ÒtƒðH‹•PþÿÿH‹4ƒÂÓu¶V…Òu&H�=ÉÜÿÿè±�Ä IcÆH‹tÃøH�=ÍÚÿÿèWÇE”‰Âƒò‰U˜‰EœÇEˆH‰•0þÿÿÇD•ˆ‰ÀH‰…@þÿÿÇD…ˆ…Éu¶O…É…x H‹…PþÿÿH‹xƒÀÓu¶G…À…§ H‹…PþÿÿH‹xƒÀÓu¶G…ÀtMH‹…PþÿÿH�XH�µ�þÿÿè½/…Àˆˆ ·…¨þÿÿ%ð=@uH‹ H�_Úÿÿ¿¾1Àè'(¿1öè‹/HcE�L‹¥PþÿÿI‹ÄHcEŒI‹<ÄL�½ˆþÿÿH‰ÞL‰úèòI‰ÆHcEˆH‰…øýÿÿI‹<ÄH‰ÞL‰úèÕHÇ…èýÿÿH‰E L‰u¨L‰ñH Á„ÿH��èýÿÿH‰�ðýÿÿH�
Add 'etcupdate' command, update bundled files
2025-11-17 09:05:09 -04:00
ÉâÿÿH‰�`þÿÿë/AˆÆAƒÆH‹�`þÿÿD‰1H‹…àýÿÿH‰H‹E L‹u¨L‰ñH Á„²H‹�ðýÿÿH‰�àýÿÿWÀ)E°)EÀH…ÀtM…ötH‹H1ÀI;NŸÀë ¸ë1À‰Á�4ÅL‹D5 I‹PL‰D5°L‰D5ÀI‹x@H‰|5 IÇ@@‰ÆƒöH‹|õ H…ÿt{L�õ ÿÿÿIèëHL‹Lõ°IƒÁ@I‰9H‰|õ°L‹O@M‰HÇG@H‹H9úLÆHN׉ƃöL�õ ÿÿÿIèH‹|õ H…ÿtL�JL9OHƒ|õÀu¦L� õÀÿÿÿIéë¢L‹DÍÀ‰ÁI‹@H‰…hþÿÿH‹DÍ°L‹pH‹EÀH‰…þÿÿH…Àt4H‹�hþÿÿH‹…þÿÿH+HHH‰�XþÿÿH‹E°L‰ñH+HHHH‰�pþÿÿë3H‹�`þÿÿH‹AH‹I0H‹•hþÿÿH)ÊHÂH‰•XþÿÿL‰òH)ÊHÂH‰•pþÿÿH‹EÈH‰…þÿÿH…Àt4H‹�hþÿÿH‹…þÿÿH+HHH‰�þÿÿH‹E¸L‰ñH+HHHH‰�þÿÿë3H‹�`þÿÿH‹A H‹I0H‹•hþÿÿH)ÊHÂH‰•þÿÿL‰òH)ÊHÂH‰•þÿÿ¿pèË#ÇHÇ@hH‹�XþÿÿH‰HH‹µpþÿÿH‰pH‹•þÿÿH‰PH‹•þÿÿH‰P H‹•hþÿÿH‰P(H‰…`þÿÿL‰p0I‰öI)ÎIÿÆu!H‹…`þÿÿHÇ@8H‹�þÿÿL‹µþÿÿ1Àë-¾L‰÷è‚$H‹�`þÿÿH‰C8¾L‰÷èj$H‹KL‹s I)ÎH‹�`þÿÿH‰APIÿÆuH‹…`þÿÿHÇ@@1Àë%¾L‰÷è/$H‹�`þÿÿH‰A@¾L‰÷è$H‹�`þÿÿH‰AXL‹q0L+q(IÿÆuH‹…`þÿÿHÇ@H1Àë%¾L‰÷èß#H‹�`þÿÿH‰AH¾L‰÷èÇ#H‹�`þÿÿH‰A`Hƒ½þÿÿ„ÀH‹…þÿÿëH‹…xþÿÿH‹@@H…À„£L‹xH‰…xþÿÿL‹`M)üIÿÄtÕL+½hþÿÿIÁçH‹…`þÿÿH‹H`LùH‰�€þÿÿLxHH‹…xþÿÿL‹h(L‹p81Ûë$I‹DÝI‰ßI‹ÞH‹�€þÿÿH‰ÙHÿÃI9Ü„zÿÿÿI‹4ßH…ötÓI‹ÞH‹…€þÿÿH;Ø…I‹|Ýè×*…ÀtÈéïHƒ½þÿÿ„ÀH‹…þÿÿëH‹…xþÿÿH‹@@H…À„£L‹xH‰…xþÿÿL‹`M)üIÿÄtÕL+½hþÿÿIÁçH‹…`þÿÿH‹H`LùH‰�€þÿÿLxHH‹…xþÿÿL‹h(L‹p81Ûë$I‹DÝI‰ßI‹ÞH‹�€þÿÿH‰ÙHÿÃI9Ü„zÿÿÿI‹4ßH…ötÓI‹ÞH‹…€þÿÿH;Ø…4I‹|Ýè *…ÀtÈé!L‹•`þÿÿL‰ÐHƒÀhH‰…ðýÿÿH‹…hþÿÿHÁàA¾I)Æ°‰…8þÿÿH�EÀE1äL‹�XþÿÿH‹µpþÿÿL‰µ(þÿÿë/A¼H�EÈH‹µþÿÿL‹�þÿÿö…8þÿÿÇ…8þÿÿ„ÔL‹L�~1Àë*H9ñÁI‹JHH‹ ÁK‹Tâ8H‰ ÂI‹J`H‹ ÁK‹TâPH‰ ÂHÿÀI� M…ÀtÍI;|ÍJ�ݹH)ÁH‰�hþÿÿ¸L)ØH‰…pþÿÿL‰�XþÿÿL‰½ þÿÿë I‰øH…ÿ„LÿÿÿM‹(I‹@H‰ÃL)ëHÿļM)ÝIÁåK‹DâPLèH‰…€þÿÿOlâ8I‹@ H‰…xþÿÿL‰…HþÿÿM‹x0E1öë'H‹…xþÿÿJ‹ðK‰DõK‹÷H‹�€þÿÿJ‰ñIÿÆL9ót8K‹tõH…ötÏK‹÷H‹…€þÿÿJ;ð…ŒH‹…xþÿÿJ‹<ðè[(…ÀtÅésL‹…HþÿÿI‹@L‹•`þÿÿL‹�XþÿÿL‹µ(þÿÿL‹½ þÿÿI‹PH‹�hþÿÿH� ÁH…pþÿÿI�Ö1öL‰Ãfff.„H‹{@M‰øH…ÿtL‹L� 0M)ØM9Á�ØþÿÿI‹zHH×H‹<÷O‹Dâ8IÈI‰<ðI‹z`H×H‹<÷O‹DâPIÈI‰<ðHÿÆë®Hƒ½þÿÿ”ÁE1öHƒ½þÿÿ”ÀÁ…uøÿÿH‹�`þÿÿH‹YH‹A H+YH+AA¾H9Ã…VøÿÿHÿÃH‹…`þÿÿL‹x8H‹H@H‰�€þÿÿH‹HPH‰�xþÿÿL‹hXE1äL9ãtHK‹<çH…ÿ„øÿÿH‹…€þÿÿJ‹4àH…ö„øÿÿH‹…xþÿÿJ‹àK;Tå…ï÷ÿÿèû&IÿÄ…Àt¸éÞ÷ÿÿA¾éÓ÷ÿÿH�=ÐÿÿèøH�=•Îÿÿèè×&H‹tÃH�=v×ÿÿè–H�µ�þÿÿèŠ&…Àx`·…¨þÿÿ%ð=@…aöÿÿH‹…PþÿÿH‹H�%Ñÿÿ¿¾1Àèíé:öÿÿH‹…PþÿÿH�XH�µ�þÿÿè1&…ÀyzH‰�PþÿÿH‹…PþÿÿH‹8臀=©N…ŽH‹£<H‹H‰…xþÿÿHÇ…Xþÿÿ€=|N…žH�=×ÿÿ¾ºH‹�xþÿÿè&é|H�=åÔÿÿèó·…¨þÿÿ%ð=@…­õÿÿH‹ H�YÐÿÿ¿¾1Àè!é�õÿÿHÇ…Xþÿÿ€=N…!HÇ…€þÿÿH‹…PþÿÿH‹�øýÿÿH‹<ÈH‹ð;H‹H�5{Óÿÿè�%H…ÀuH‹…PþÿÿH‹�øýÿÿH‹<Èè…H‹¾;H‹H‹¤;L‹0Hƒ½€þÿÿuHÇ…XþÿÿéH‹…pÿÿÿH‰…(þÿÿH‹…xÿÿÿH‰…8þÿÿH‹E€H‰… þÿÿE1íHÇ…Xþÿÿë"L‹­hþÿÿH‹�€þÿÿH‹IhH‰�€þÿÿH…É„ÃH‹…€þÿÿ‹ƒø…(€= MuÊ°‰…HþÿÿöL‰…xþÿÿH�&ÕÿÿH‰…`þÿÿH‹…€þÿÿH‹@I÷ÕH‰…hþÿÿIÅM…í�JH‹…€þÿÿHƒÀH‰…pþÿÿ€½xþÿÿ„#€½HþÿÿtjL‰÷H�5$ÑÿÿH‹•(þÿÿ1ÀèO$H‹�€þÿÿH‹AH;A|AIÇÇÿÿÿÿL‹¥€þÿÿI‹D$8I‹L$PJ‹|øJ‹Tù¾L‰ñè$I‹D$I+D$IÿÇI9Ç|Æ€='L…�L‰÷H‹µ`þÿÿH‹•8þÿÿ1ÀèØ#L‹½0þÿÿAÁçH‹�pþÿÿJ‹D9J;9|LL½pþÿÿIÇÅÿÿÿÿH‹�0þÿÿH‹•€þÿÿH‹DÊ8H‹LÊPJ‹|èJ‹Té¾L‰ñèŽ#I‹GI+IÿÅI9Å|¾ºH�=+ÊÿÿL‰ñè6#°H‰…XþÿÿH‹…@þÿÿÁàL‹­pþÿÿI‹LI;LL‹¥€þÿÿ|BIÅIÇÇÿÿÿÿH‹�@þÿÿI‹DÌ8I‹LÌPJ‹|øJ‹Tù¾L‰ñè#I‹EI+EIÿÇI9Ç|È€½xþÿÿtL‰÷H�5šÒÿÿH‹• þÿÿ1ÀèÆ"H
Finish adding support for 14.3
2025-09-04 08:48:14 -06:00
é–ýÿÿƒø
Add 'etcupdate' command, update bundled files
2025-11-17 09:05:09 -04:00
t>‹C�Hÿ‰K…À~H‹H�HH‰ ëH‰ßè�"ƒøÿuÒ·C¨@…š¨ tÇé�I�GÿM…ÿI‰Ç¶éBýÿÿIƒýM‰ýŽ¶ýÿÿM�}ÿëI‹H�HI‰Dˆ Aƒü
tÚ‹C�Hÿ‰K…À~H‹H�HH‰ D¶ ë*H‰ßè'"A‰Äƒøÿu·C¨@…!A¼ÿÿÿÿ¨ …bA‹F �HÿA‰N …À—A€ü
Copy Permalink