[patch] Patch adding python tk USE flag dependency

editobj.usedep.patch (text/plain), 6.41 KB, created by Pavel Bazika on 2009-02-27 23:25:00 UTC

DIFF(1)                          User Commands                         DIFF(1)



[1mNAME[0m
       diff - compare files line by line

[1mSYNOPSIS[0m
       [1mdiff [22m[[4mOPTION[24m]... [4mFILES[0m

[1mDESCRIPTION[0m
       Compare files line by line.

       [1m-i  --ignore-case[0m
              Ignore case differences in file contents.

       [1m--ignore-file-name-case[0m
              Ignore case when comparing file names.

       [1m--no-ignore-file-name-case[0m
              Consider case when comparing file names.

       [1m-E  --ignore-tab-expansion[0m
              Ignore changes due to tab expansion.

       [1m-b  --ignore-space-change[0m
              Ignore changes in the amount of white space.

       [1m-w  --ignore-all-space[0m
              Ignore all white space.

       [1m-B  --ignore-blank-lines[0m
              Ignore changes whose lines are all blank.

       [1m-I [22mRE  [1m--ignore-matching-lines[22m=[4mRE[0m
              Ignore changes whose lines all match RE.

       [1m--strip-trailing-cr[0m
              Strip trailing carriage return on input.

       [1m-a  --text[0m
              Treat all files as text.

       [1m-c  -C [22mNUM  [1m--context[22m[=[4mNUM[24m]
              Output NUM (default 3) lines of copied context.

       [1m-u  -U [22mNUM  [1m--unified[22m[=[4mNUM[24m]
              Output NUM (default 3) lines of unified context.

       [1m--label [22mLABEL
              Use LABEL instead of file name.

       [1m-p  --show-c-function[0m
              Show which C function each change is in.

       [1m-F [22mRE  [1m--show-function-line[22m=[4mRE[0m
              Show the most recent line matching RE.

       [1m-q  --brief[0m
              Output only whether files differ.

       [1m-e  --ed[0m
              Output an ed script.

       [1m--normal[0m
              Output a normal diff.

       [1m-n  --rcs[0m
              Output an RCS format diff.

       [1m-y  --side-by-side[0m
              Output in two columns.

       [1m-W [22mNUM  [1m--width[22m=[4mNUM[0m
              Output at most NUM (default 130) print columns.

       [1m--left-column[0m
              Output only the left column of common lines.

       [1m--suppress-common-lines[0m
              Do not output common lines.

       [1m-D [22mNAME  [1m--ifdef[22m=[4mNAME[0m
              Output merged file to show `#ifdef NAME' diffs.

       [1m--GTYPE-group-format[22m=[4mGFMT[0m
              Similar, but format GTYPE input groups with GFMT.

       [1m--line-format[22m=[4mLFMT[0m
              Similar, but format all input lines with LFMT.

       [1m--LTYPE-line-format[22m=[4mLFMT[0m
              Similar, but format LTYPE input lines with LFMT.

       LTYPE is `old', `new', or `unchanged'.
              GTYPE is LTYPE or `changed'.

              GFMT may contain:

       %<     lines from FILE1

       %>     lines from FILE2

       %=     lines common to FILE1 and FILE2

       %[-][WIDTH][.[PREC]]{doxX}LETTER
              printf-style spec for LETTER

              LETTERs are as follows for new group, lower case for old group:

       F      first line number

       L      last line number

       N      number of lines = L-F+1

       E      F-1

       M      L+1

              LFMT may contain:

       %L     contents of line

       %l     contents of line, excluding any trailing newline

       %[-][WIDTH][.[PREC]]{doxX}n
              printf-style spec for input line number

              Either GFMT or LFMT may contain:

       %%     %

       %c'C'  the single character C

       %c'\OOO'
              the character with octal code OOO

       [1m-l  --paginate[0m
              Pass the output through `pr' to paginate it.

       [1m-t  --expand-tabs[0m
              Expand tabs to spaces in output.

       [1m-T  --initial-tab[0m
              Make tabs line up by prepending a tab.

       [1m--tabsize[22m=[4mNUM[0m
              Tab stops are every NUM (default 8) print columns.

       [1m-r  --recursive[0m
              Recursively compare any subdirectories found.

       [1m-N  --new-file[0m
              Treat absent files as empty.

       [1m--unidirectional-new-file[0m
              Treat absent first files as empty.

       [1m-s  --report-identical-files[0m
              Report when two files are the same.

       [1m-x [22mPAT  [1m--exclude[22m=[4mPAT[0m
              Exclude files that match PAT.

       [1m-X [22mFILE  [1m--exclude-from[22m=[4mFILE[0m
              Exclude files that match any pattern in FILE.

       [1m-S [22mFILE  [1m--starting-file[22m=[4mFILE[0m
              Start with FILE when comparing directories.

       [1m--from-file[22m=[4mFILE1[0m
              Compare FILE1 to all operands.  FILE1 can be a directory.

       [1m--to-file[22m=[4mFILE2[0m
              Compare all operands to FILE2.  FILE2 can be a directory.

       [1m--horizon-lines[22m=[4mNUM[0m
              Keep NUM lines of the common prefix and suffix.

       [1m-d  --minimal[0m
              Try hard to find a smaller set of changes.

       [1m--speed-large-files[0m
              Assume large files and many scattered small changes.

       [1m-v  --version[0m
              Output version info.

       [1m--help [22mOutput this help.

       FILES  are  `FILE1  FILE2'  or `DIR1 DIR2' or `DIR FILE...' or `FILE...
       DIR'.  If [1m--from-file [22mor [1m--to-file [22mis given, there are no  restrictions
       on  FILES.  If a FILE is `-', read standard input.  Exit status is 0 if
       inputs are the same, 1 if different, 2 if trouble.

[1mAUTHOR[0m
       Written by Paul Eggert, Mike Haertel, David  Hayes,  Richard  Stallman,
       and Len Tower.

[1mREPORTING BUGS[0m
       Report bugs to <[e-mail]>.

[1mCOPYRIGHT[0m
       Copyright © 2004 Free Software Foundation, Inc.
       This is free software; see the source for copying conditions.  There is
       NO warranty; not even for MERCHANTABILITY or FITNESS FOR  A  PARTICULAR
       PURPOSE.

[1mSEE ALSO[0m
       The  full documentation for [1mdiff [22mis maintained as a Texinfo manual.  If
       the [1minfo [22mand [1mdiff [22mprograms are properly installed  at  your  site,  the
       command

              [1minfo diff[0m

       should give you access to the complete manual.



diffutils 2.8.7                   April 2004                           DIFF(1)