DIFF(1) DIFF(1)
[-abcdefhilnpqrstuwyBEHNPT] [-LINES] [-x PATTERN] [-C LINES] [-D NAME]
[-F REGEXP] [-I REGEXP] [-L LABEL] [-S FILE] [-U LINES] [-W COLUMNS]
[-X FILE] [--binary] [--brief] [--changed-group-format=fORMAT] [--con-
text[=LINES]] [--diff-program=PROGRAM] [--ed] [--exclude=PATTERN]
[--exclude-from=FILE] [--expand-tabs] [--forward-ed] [--from-file=FILE]
[--horizon-lines=LINES] [--ifdef=NAME] [--ignore-all-space]
[--ignore-blank-lines] [--ignore-case] [--ignore-file-name-case]
[--ignore-matching-lines=REGEXP] [--ignore-space-change]
[--ignore-tab-expansion] [--inhibit-hunk-merge] [--initial-tab]
[--label=LABEL] [--left-column] [--line-format=FORMAT] [--minimal]
[--new-file] [--new-group-format=FORMAT] [--new-line-format=FORMAT]
[--no-ignore-file-name-case] [--old-group-format=FORMAT]
[--old-line-format=FORMAT] [--paginate] [--rcs] [--recursive]
[--report-identical-files] [--sdiff-merge-assist] [--show-c-function]
[--show-function-line=REGEXP] [--side-by-side] [--speed-large-files]
[--starting-file=FILE] [--strip-trailing-cr] [--supress-common-lines]
[--text] [--to-file=FILE] [--unchanged-group-format=FORMAT]
[--unchanged-line-format=FORMAT] [--unidirectional-new-file] [--uni-
fied[=LINES]] [--width=COLUMNS] FROMFILE TOFILE
diff [-v] [--help] [--version]
2
FROMFILE
TOFILE
`-'
FROMFILE
TOFILE
diff
FROMFILE
TOFILE
()
`-'
diff
-r
--recursive
diff
`-'
--from-file=FILE
FILE
--to-file=FILE
FILE [: 2.7 ]
-LINES LINES
()
-c -u
obsolete patch(1)
2
-a, --text
1
-b, --ignore-space-change
-c context
-d, --minimal
diff
()
-e, --ed
ed(1)
-f, --forward-ed
ed
[: ed ]
-h Unix
-i, --ignore-case
-l, --paginate
pr(1)
-n, --rcs
RCS diff -f
-p, --show-c-function
C `-F'^[_a-zA-Z$]''
-q, --brief
-r, --recursive
-s, --report-identical-files
2
-t, --expand-tabs
-u unified
-w, --ignore-all-space
-x PATTERN, --exclude=PATTERN
base PATTERN
-y, --side-by-side
side-by-side
-B, --ignore-blank-lines
-C LINES, --context[=LINES]
context LINES
() LINES
3 patch
2
-D NAME, --ifdef=NAME
if-then-else
NAME
-E, --ignore-tab-expansion
-F REGEXP, --show-function-line=REGEXP
context unified
hunk ()
REGEXP
-H, --speed-large-files
-H
-I REGEXP, --ignore-matching-lines=REGEXP
REGEXP
-L LABEL, --label=LABEL
context unified
LABEL
-L
-N, --new-file
-P, --unidirectional-new-file
2 1
-P
-S FILE, --starting-file=FILE
FILE
-T, --initial-tab
normal context
-U LINES, --unified[=LINES]
unified LINES
() LINES
3 patch
2
-W COLUMNS, --width=COLUMNS
side-by-side COLUMNS
-XFILE, --exclude-from=FILE
base FILE
--binary
(Linux POSIX )
--changed-group-format=FORMAT
if-then-else
FORMAT
--diff-program= PROGRAM
diff
PROGRAM
--from-file=FILE
FILE
(FILE ) [: 2.7 ]
--horizon-lines=LINES
LINES
--ignore-file-name-case
``foo'' ``Foo''
--inhibit-hunk-merge
hunk hunk
--left-column
side-by-side
--line-format=FORMAT
if-then-else FORMAT
--new-group-format=FORMAT
if-then-else 2 FORMAT
--new-line-format=FORMAT
if-then-else 2 FORMAT
--no-ignore-file-name-case
``foo'' ``Foo'' --ignore-file-name-case
--old-group-format=FORMAT
if-then-else 1 FORMAT
--old-line-format=FORMAT
if-then-else 1 FORMAT
--sdiff-merge-assist
sdiff(1)
sdiff
diff
--strip-trailing-cr
CR
CRLF
--suppress-common-lines
side-by-side
--unchanged-group-format=FORMAT
if-then-else
FORMAT
--unchanged-line-format=FORMAT
if-then-else
FORMAT
--help
-v, --version
diff
context
context 2 :
*** FROMFILE FROMFILE-MODIFICATION-TIME
--- TOFILE TOFILE-MODIFICATION-TIME
-L LABEL
hunk ()
context hunk :
***************
*** FROMFILE-LINE-RANGE ****
FROMFILE-LINE
FROMFILE-LINE...
--- TOFILE-LINE-RANGE ----
TOFILE-LINE
TOFILE-LINE...
2 2
! 2
`!'
+ 2 1
- 1 2
hunk FROMFILE
TOFILE
unified
--- FROMFILE FROMFILE-MODIFICATION-TIME
+++ TOFILE TOFILE-MODIFICATION-TIME
-L LABEL
hunk ()
hunk 1 1 unified hunk :
@@ FROMFILE-RANGE TOFILE-RANGE @@
LINE-FROM-EITHER-FILE
LINE-FROM-EITHER-FILE...
1 :
+ 1
- 1
side-by-side
2 (gutter)
1
` '
--ignore
|
< 1
> 2
( 1
) 2
\ 1
/ 2
2
1 `\' 2 `/'
side-by-side
ed(1)
1 hunk
ed
ed
hunk :
CHANGE-COMMAND
TO-FILE-LINE
TO-FILE-LINE...
.
ed
1 diff
1
2
2 1 ed ed
2
diff
3 1 ()
1
:
La 1 L 2
`8a' 1 8
Rc 1 R
`5,7c' 1 5 7 2
Rd 1 R
`5,7d' 1 5 7
diff
ed
hunk forward ()
1 ed forward ed
forward ed
ed
patch
diff
diff
RCS
RCS Revision Control System (RCS)
RCS
forward ed
1
1
`c'
`a' `d'
2
C
diff
2 C
C #ifdef NAME
#ifndef NAME, ,BR #else ", and " #endif
NAME
`wait (&s)' `waitpid (-1, &s, 0)'
`--ifdef=HAVE_WAITPID' :
do {
#ifndef HAVE_WAITPID
if ((w = wait (&s)) < 0 && errno != EINTR)
#else /* HAVE_WAITPID */
if ((w = waitpid (-1, &s, 0)) < 0 && errno != EINTR)
#endif /* HAVE_WAITPID */
return w;
} while (w != child);
if-then-else
TeX `old' `new' old `\begin{em}'-`\end{em}' new
`\begin{bf}'-`\end{bf}'
diff \
--old-group-format='\begin{em}
%<\end{em}
' \
--new-group-format='\begin{bf}
%>\end{bf}
' \
old new
diff \
--old-group-format='\begin{em}
%<\end{em}
' \
--new-group-format='\begin{bf}
%>\end{bf}
' \
--unchanged-group-format='%=' \
--changed-group-format='\begin{em}
%<\end{em}
\begin{bf}
%>\end{bf}
' \
old new
"plain English"
diff \
--unchanged-group-format='' \
--old-group-format='-------- %dn line%(n=1?:s) deleted at %df:
%<' \
--new-group-format='-------- %dN line%(N=1?:s) added after %de:
%>' \
--changed-group-format='-------- %dn line%(n=1?:s) changed at %df:
%<-------- to:
%>' \
old new
diff
1 4
1 FORMAT
--old-group-format=FORMAT
1 hunk
old changed
--new-group-format=FORMAT
2 hunk
new changed
--changed-group-format=FORMAT
hunk
changed old new
--unchanged-group-format=FORMAT
hunk
unchanged
%< 1
old
%> 2
new
%=
unchanged
%% `%'
%c'C'' C
1 C C
`%c':'' if-then-else then then
%c'\O''
0
1 3 8 8 0
`%c'\0''
(A=B?T:E)
A B
T
E A B
10 1
A B T
E
`%(N=0?no:%dN) line%(N=1?:s)' N (new ) 0 `no lines' N 1 `1
line' `%dN lines'
FN F
printf(3)
N
F N
e old
f old e + 1
l old
m old l + 1
n old l - f + 1
E, F, L, M, N
new
printf
%d, %o, %x, %X ( 10 , 8 , 16 , 16 ) `%'
`-' () ()
(; )
`%5dN' new 5 printf
"%5d"
if-then-else
1
`-'
`|'
diff \
--old-line-format='-%l
' \
--new-line-format='|%l
' \
--unchanged-line-format=' %l
' \
old new
FORMAT
--old-line-format=FORMAT
1
--new-line-format=FORMAT
2
--unchanged-line-format=FORMAT
--line-format=FORMAT
`%' :
%l
%L
%% `%'
%c'C'' C
1 C C
`%c':'' if-then-else then then
%c'\O''
0
1 3 8 8 0
`%c'\0''
Fn F
printf(3)
F
`%.5dN' `%.5d' printf
`%l'
`%l' `%L'
( `%l' `%L' )
-t
diff diff
diff \
--old-line-format='< %l
' \
--new-line-format='> %l
' \
--old-group-format='%df%(f=l?:,%dl)d%dE
%<' \
--new-group-format='%dea%dF%(F=L?:,%dL)
%>' \
--changed-group-format='%df%(f=l?:,%dl)c%dF%(F=L?:,%dL)
%<---
%>' \
--unchanged-group-format='' \
old new
2
-s
diff
-r
diff
diff
diff
( 1
2 )
-N
-N -P
-P -N
2
1 ()
-x PATTERN
PATTERN
`-x '*.[ao]'' `.a' `.o'
`-x 'RCS' -x '*,v''
`RCS' `*,v'
:
0
1
2
cmp(1),
comm(1), diff3(1), ed(1), patch(1), pr(1), sdiff(1)
bug-gnu-utils [AT] gnu.org
Ragnar Hojland Espinosa <ragnar [AT] ragnar-hojland.com>
GNU diff Utilities 2.8.1 October 2002 DIFF(1)