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

101 lines
35 KiB
Plaintext
Raw Normal View History

ELF >0 @Є@8
@@@ @ 00pp p  ü)ü)00 0  9 9pp p xð¨(€(€ (€ PPRåtdxxPåtd´#´# ´#  Qåtdˆˆ ˆ 00/libexec/ld-elf.so.1FreeBSDhSFreeBSD)8= QYa¡©¯µ»ÀÇÎÖÜäóú
"'.8?DKSYagpw~Ÿ¦«µÁÍÔÚ p 0 r!@Ð!À!è!Žà!Ø!°(z µ(zê0 ÁL05¼Pvž¦Ý£k bd¶žƒ³¢÷æƒÓªÍ3Ä÷88 +)03 7.$!&%/16'#2-
4", 
(*5 libc.so.7__progname_init_tlsFBSD_1.0atexitenvironexit_Jv_RegisterClasses__error__srget__stack_chk_fail__stack_chk_guard__stderrp__stdinp__stdoutp__swbuf_exitabortclosedup2execvpfclosefprintffputcfreopenfstatFBSD_1.5fwritegetopt_longmemcmpmemcpyoptargoptindpipeprintfsetlocalesignalstatstrcmpstrncmpvforkwaitpidfputsvfprintfcallocmallocmemsetreallocfflushstrerror_rgetpidkillsigactionsigaltstacksigemptysetstrlenwriteread!2Ð!3À!4è!5à!6Ø!7Pp Xp `p hp pp xp €p ˆp p ˜p  p ¨p °p ¸p Àp Èp Ðp Øp àp èp 
ðp øp q q q  q  q (q  0q 
8q  @q !Hq  Pq #Xq %`q $hq "pq &xq '€q +ˆq ,q *˜q - q .¨q (°q )¸q /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/^\.//
j5 ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P r3 ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ±P ©3 ±P ±P ±P õ3 ±P ±P ±P ±P ±P ±P ½3 ±P ±P ±P ±P ±P ±P ±P â3 ±P ±P ±P î3 ±P ±P ±P ±P ±P ±P ±P ±P 4 ±P ±P ±P 43 ±P ±P ±P
4 ±P ±P ±P 4 ±P ±P ±P ±P ±P ±P ±P ±P H4 ±P %4 Á è 3 e~ R Ti Lá ml x} AÔ E| Î aç vÎ ô  Œ  : ˆ  g Î · Ë 7 - ˆ æ  ¹] ·\ æ\ ß\ ô\ û\ ] ] í\ ] memory exhausted; L $l
L\|,¤œ-ÔÌ-ü .,.<\.\l4Œ|7¼l8ä :¬:<Ü:\ ;,;¬\;Ô|;üÜ;$<LL<t|<œ¼<̬=üœ>,ü?\¬@¼@¤Ü@ÄŒAì,BzRx $ AC
ŒŽ,D áAC
ŒŽÒ $tØ TAC
I ,œ
jAC
ŒŽu A $ÌÀ+0AC
W A ôÈ+9AC
è+AC
4è+)AC
,Tø+
AC
ŒŽr A ,Ø1
AC
ŒŽT A $´¸4âAC
Ñ A ,Ü€5žAC
Ž A $ ð6AC
 A 4h70AC
$Tx7-AC
c A $|€7AC
K A $¤x70AC
f A $Ì€7AC
K A $ôx7^AC
T A $°7<AC
r A $DÈ7+AC
[ E $lÐ7&AC
\ A ,Ø71AC
Ž` E ,Äè7ðAC
ŽÚ A ,ô¨8ãAC
ŽÅ A ,$h9XAC
ŒŽ A $T˜:§AC
˜ A | ;AC
A œ;AC
$¼;­AC
Ž,ä˜; AC
ŒŽ $<jAC
e 
ë
¿
è#2H‹3HƒÃH…öu¤¿ƒ ¾á ºü ¹ 1Àèé1H‹=¢ãöG@…Žèó1…À…‹H‹H;EÐ1ÀHÄø[A\A]A^A_]ÃD‰âD¶-±ZE‰ìA÷ÔE…ç¤ZD‰ù÷ÑD!é