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

98 lines
28 KiB
Plaintext
Raw Normal View History

ELF >`: @pj@8 @@@ @ hh¨¨ ¨  T*T*`*`: `: P9P9°c°ƒ °ƒ xx(e(• (• ÀÈŠØc؃ ؃ PPRåtd°c°ƒ °ƒ xxPåtd$$ $  QåtdÀÀ À HH/libexec/ld-elf.so.1FreeBSD8[FreeBSDFreeBSD %* >FNŽœ¢§­²¹ÀÈÎÖÜãï !&-5;CIRY`govˆ£¯¼(• _!@Ð!öÀ!qè!{à!ýØ!Á°(z˵(zÔ0 ÁL05¼Pvž¦Ý£k bd¶žƒ³¢÷æƒÓªÍ3Ä÷88
+)03 7.$!&%/16'#2-4",  
(*5 __progname_init_tlsatexitenvironexit_Jv_RegisterClasses__error__srget__stack_chk_fail__stack_chk_guard__stderrp__stdinp__stdoutp__swbuf_exitabortbcmpclosedup2execvpfclosefprintffputcfreopenfstatfwritegetopt_longmemcpyoptargoptindpipeprintfsetlocalesignalstatstrcmpstrncmpvforkwaitpidfputsvfprintfcallocmallocmemsetreallocfflushstrerror_rgetpidkillsigactionsigaltstacksigemptysetstrlenwritereadlibc.so.7FBSD_1.0FBSD_1.5!2Ð!3À!4è!5à!6Ø!7x• €• ˆ• ˜•  • ¨• °• ¸• À• È• Е Ø•  à• è• ð• ø• 
(– 0– 8–  @– H– P 
X– `  h !p  x #€– %ˆ– $ "˜– &  '¨– +°– ,¸– *À– -È– .Ж (Ø– )à– /read 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 S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S S â= S S S S S S S S S S S S S >> S S S > S S S S S S U> S S S S S S S z> S S S †> S S S S S S S S > S S S ”> S S S > S S S ©> S S S S S S S S µ> S >  8 3i eÎ ¢ T¹ L1 m¼ xÍ A$ EÌ  a7 v D f Ü Ö Š Ø X ·     } Ø 6 l Þg Üf g g g g 'g .g g 5g memory exhausted; \$lL||L¤L7Ô|7ü¼7Ü7< 8\L>ŒLA¼<BäìCŒD<¼D\ìD E¬<EÔ\Eü¼E$üEL,FtLFœŒFÌ|GülH,ÌI\|JŒJ¤¬JÄ\KìüKzRx $0AC
ŒŽ,DAC
ŒŽó $tø[AC
g E ,œ óAC
ŒŽE A $Ìp50AC
W A ôx59AC
˜5AC
4˜5)AC
,T¨52AC
ŒŽ A ,¸;ôAC
ŒŽ; A $´ˆ>ìAC
Û A ,ÜP?£AC
Ž A $ Ð@AC
 A 4HA0AC
$TXA$AC
Z A $|`AAC
K A $¤XA'AC
] A $Ì`AAC
K A $ôXA^AC
T A $A<AC
r A $D¨A+AC
[ E $l°AAC
S A ,¨A1AC
Ž` E ,ĸAðAC
ŽÚ A ,ôxBãAC
ŽÅ A ,$8CXAC
ŒŽ A $ThD§AC
˜ A |ðDAC
A ψDAC
$¼àD­AC
Ž,ähEAC
ŒŽ ,ØE`AC
M A M UH‰åAWAVAUATSPI‰þL?IcÇL$ÇIƒÄHƒ=y\uL‰%p\IƒÆE…ÿ~I‹H…Àu¸Øƒ H…Àt/H‰÷è6éŒH‰aZHƒÀ¶Hÿ„Ét΀ù/tèëí¾I9õsU¸¢‰×A‰È1À¢»¹ƒør 1ɸ¢Aƒ}%uIEH‰EÐD‰Æ‰ÚAÿU¾H‹MÐH‰IƒÅI9õr«èœ5D‰ÿL‰öL‰âèD‰ÿL‰öL‰âèð‰Çè‰5fUH‰åAWAVAUATSPH‰Uи؃ H…À…ÓI‰÷A‰ü¿€< è05¸`: »`: H)ÃLkH…ÛH‰ØIHÅHÁøtBE1öë!f.IƒÆH…ÛH‰ØIHÅHÁøI9ÆsJ‹õ`: HƒørÛD‰çL‰þH‹UÐÿÐëÍè4¸`: A¾`: I)ÆMnM…öL‰ðIHÅHÁøt91ÛëfHƒÃM…öL‰ðIHÅHÁøH9ÃsH‹Ý`: HƒørÛD‰çL‰þHUÐÿÐëÍHƒÄ[A\A]A^A_]Ãf.@UH‰åSP¹`: ¸`: H)ÈHXH…ÀH‰ÁHHËHÁùu HƒÄ[]éú3H…ÀHIØHÁûëH…ÛtâH‹ÝX: HƒÃÿHƒøréÿÐëåÌÌÌÌÌUH‰å€=UXu(H
AXHH…
ëÌ¿
è1ëÀ¿Ó ¾1 ºL ¹U 1ÀèÙ0H‹=bßöG@…Êèã0…À…ÇH‹ôÞH;EÐ…k1ÀHÄø[A\A]A^A_]ÃM L‰÷èv0…À„”AƒÇD‰øH‹þÿÿH‹<Á¾ èR0D‰û…À„mÇ…tÿÿÿ‰Øƒð‰…xÿÿÿ‰|ÿÿÿÇ…hÿÿÿÇ„…hÿÿÿ‰ØÇ„…hÿÿÿ¾ L‰÷èý/…ÀL‹½þÿÿtCHµpþÿÿL‰÷è#0…Àˆ·…ˆþÿÿ%ð=@uI‹º× ¿¾1Àè)I‹_¾ H‰ßèž/…ÀtGMwHµpþÿÿH‰ßèÇ/…Àˆ¯·…ˆþÿÿ%ð=@uI‹º× ¿¾1Àè³(I‹_¾ H‰ßèB/…ÀtGMwHµpþÿÿH‰ßèk/…ÀˆS·…ˆþÿÿ%ð=@uI‹º× ¿¾1ÀèW(1ÀH‰…`þÿÿ¿1öè2/Hc…pÿÿÿI‹ÇHc…lÿÿÿI‹<ÇM‰üL½hþÿÿH‰ÞL‰úè—I‰ÆHc…hÿÿÿH‰…ðýÿÿI‹<ÄH‰ÞL‰úèwHÇ…øýÿÿH‰E€L‰uˆL‰ñH Á„XHøýÿÿA¹ # ë4»L‹8þÿÿA‰H‹…þÿÿL‰H‹E€L‹uˆH‰ÁL ñH‹èýÿÿ)E)E H…ÀH‰þÿÿtM…öt)HH1ÀI;NŸÀëf.¸ë f1À‰ÁH‹\Í€HSH‰\ÍH‰\Í H‹s@H‰tÍ€HÇC@‰Çƒ÷H‹tý€H…öuUë|H‹\ýHƒÃ@H‰3H‰týH\ý€H[@H‰\ý€HÇF@Hv1ÿH9ò@œÇHLÖ1ø‰Çƒ÷Hc÷Htõ€H…öt$HZH9^HcÿHƒ|ý uŸHý ÿÿÿHëë›fH‹\Í L‹cH˜H‹DÅL‹xH‹E H…ÀH‰…þÿÿtM‰åL+hL(HEM‰þL+pLpëIAII0M‰åI)ÍIÅM‰þI)ÎIÆL‰mÀL‰u°H‹E¨H…ÀH‰… þÿÿL‰¥PþÿÿL‰½`þÿÿt L+`L HE˜L+xLxëf.IA II0I)ÌIÄI)ÏIÇL‰eÈL‰}¸¿pè:$H‰ÃÇHÇ@hL‰hL‰pL‰`L‰x H‹…PþÿÿH‰C(H‹…`þÿÿH‰C0M)îIÿÆH‰8þÿÿuHÇC8HÇCPë,f¾L‰÷è%H‰C8¾L‰÷è%H‰CPLcL{ M)çIÿÇuH8þÿÿHÇC@HÇCXë.D¾L‰ÿèÃ$H‹8þÿÿH‰C@¾L‰ÿè«$H‰CXLs0L+s(IÿÆu:HCHH‰…(þÿÿHÇCHHC`H‰…HþÿÿHÇC`1ÀHƒ½þÿÿuNé3¾L‰÷èS$HKHH‰(þÿÿH‰CH¾L‰÷è7$HK`H‰HþÿÿH‰C`Hƒ½þÿÿ„êH‹þÿÿH‹YH‰XþÿÿLiI)ÝL‰éHÿÁu&HXþÿÿH‹I@H…É„²H‹…HþÿÿH‹ëÆfDH+PþÿÿHØH‰…`þÿÿHÁãH‹…(þÿÿHH‹…XþÿÿL‹p(L‹x8IƒÅE1äë,K‹æJ‰ãK‹çH‹`þÿÿJ‰áIƒÄM9å„vÿÿÿJ‹4ãH…ötÓK‹çH‹…`þÿÿJ;à K‹<æè¥*…ÀtÈé f.fH‹… þÿÿH‰ÁH…À…qL‹8þÿÿL‰ÈHƒÀhH‰…èýÿÿH‹…PþÿÿHÁàI)ÂL‹þÿÿE1öL‰•@þÿÿëL‹ þÿÿM…öA¾…ÚN‹dõÀN‹|õ°IƒÇ1Àf.I L‰úM…ÛtIH9Ñ},IIHH ÁKTñ8H‰ ÂII`H‹ ÁK‹TñPH‰ ÂHƒÀëÄ@M…Ût‹¸L)àH‰…PþÿÿJå¹H)ÁH‰(þÿÿL‰¥þÿÿL‰½HþÿÿëDI‰ûH…ÿ„DÿÿÿM‹;I‹KI‰ÍM)ýL‰èHÿÀ„»M)çIÁçK‹DñPLøH‰…`þÿÿO|ñ8I‹C H‰…XþÿÿL‰0þÿÿI‹[0IƒÅE1äë(H‹…XþÿÿJ‹àK‰çJ‹ãH‹`þÿÿJ‰áIƒÄM9åt9K‹4çH…ötÐJ‹ãH‹…`þÿÿJ;à…R
H‹…XþÿÿJ‹<àèÛ(…ÀtÅé9
fL‹0þÿÿI‹KL‹8þÿÿL‹•@þÿÿL‹¥þÿÿI‹CH‹•PþÿÿL
H‹•(þÿÿH ÊIÂ1öL‹½HþÿÿfI0I{@L‰øH…ÿtHL)àH9ÃÑþÿÿI‹AHHÐHðK‹|ñ8HÏH‰÷IA`HÐH‹ðK|ñPHÏH‰÷HƒÆë­f.H‹XþÿÿH‹I@H…ÉýÿÿH‹YH‰XþÿÿL‹iI)ÝL‰èHÿÀtÒH+PþÿÿHÁãH‹…HþÿÿH‹HØH‰…`þÿÿH‹…(þÿÿHH‹…XþÿÿL‹p(L‹x8IƒÅE1äë%K‹æJ‰ãK‹çH‹`þÿÿJ‰áIƒÄM9å„lÿÿÿJ‹4ãH…ötÓK‹çH‹…`þÿÿJ;à…ÕK‹<æèe'…ÀtÈéÃf.f1ÛH‹…þÿÿH…À”ÃÃH…À„xøÿÿHƒ½ þÿÿ„jøÿÿM‹qM+qI‹A I+A»I9Æ…LøÿÿMy8I‹A@H‰…`þÿÿIAPH‰…XþÿÿM‹iXIƒÆE1ä@M9æøÿÿK‹<çH…ÿøÿÿH‹…`þÿÿJ‹4àH…ö„ò÷ÿÿH‹…XþÿÿJ‹àK;Tå…Ü÷ÿÿè›&IƒÄ…Àt³éÊ÷ÿÿH‹…øýÿÿH‰…`þÿÿ€=L…Y€=òKL‹µþÿÿH‹ðýÿÿ…»I‹<ÞH‹Ô¾ èS&H…À„KH‹ƒÔL‹5lÔHƒ½`þÿÿ„8H‹…PÿÿÿH‰…þÿÿH‹…XÿÿÿH‰…þÿÿH‹…`ÿÿÿH‰… þÿÿHc…tÿÿÿH‰…HþÿÿHc…xÿÿÿH‰…XþÿÿHc…|ÿÿÿH‰…8þÿÿE1íÇ…@þÿÿH‹…`þÿÿë@H‹…`þÿÿH‹@hH…À„ÎH‰…`þÿÿ‹ƒø…j€=KuѸÐ H‰…þÿÿÇ…0þÿÿŠçJ‰…PþÿÿH‹…`þÿÿH‹@I÷ÕH‰…(þÿÿIÅM…íx€½Pþÿÿ„8ƒ½0þÿÿL‹­`þÿÿuy¾, L‰÷H‹•þÿÿ1Àè+%H‹•HþÿÿH‰ÐHÁàILI;L|IN<(IƒÇIÇÄÿÿÿÿfIDÕ8I‹LÕPJ‹|àJ‹Tá¾L‰ñèï$H‹•HþÿÿI‹I+GøIƒÄI9Ä|È€="J„ƒL‰÷H‹µþÿÿH‹•þÿÿ1Àè£$H‹•XþÿÿH‰ÐHÁàILI;L|QN<(IƒÇIÇÄÿÿÿÿf.I‹DÕ8I‹LÕPJJ‹Tá¾L‰ñè_$H‹•XþÿÿI‹I+GøIƒÄI9Ä|È¿‰ ¾ºL‰ñè1$°‰…@þÿÿL‹­8þÿÿL‰èHÁàH‹µ`þÿÿH‹LH;L|PH`þÿÿL<IƒÇIÇÄÿÿÿÿfH‹`þÿÿJ‹Dé8J‹LéPJ‹|àJ‹Tá¾L‰ñèÈ#I‹I+GøIƒÄI9Ä|È€½Pþÿÿt¾6 L‰÷H‹• þÿÿ1Àè‰#H‹…`þÿÿL‹xL+xL‹­(þÿÿMýM…ÿyé–ýÿÿfDƒø
tMCHÿ‰K…À~H‹HHH‰ ƒøÿuÜëf.H‰ßèH#ƒøÿuÿC¨@¨ t¸éIGÿM…ÿI‰Ç§é-ýÿÿf.IƒÿŒˆýÿÿM‰ïIƒÅÿë f.I‹HHI‰Dˆ Aƒü