|
|
133.
|
|
|
-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied context. 
-u -U NUM --unified[=NUM] Output NUM (default 3) lines of unified context.
--label LABEL Use LABEL instead of file name.
-p --show-c-function Show which C function each change is in.
-F RE --show-function-line=RE Show the most recent line matching RE. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
-c -C 行数 --context[=行数] 显示指定<行数>(默认 3 行)copied 格式的上下文
-u -U 行数 --unified[=行数] 显示指定<行数>(默认 3 行)unified 格式的上下文
--label 标识 使用<标识>代替文件名称。
-p --show-c-function 显示和每个差异有关的 C 函数名称。
-F RE --show-function-line=RE 显示最接近而符合<正则表示式>的一行。 |
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/diff.c:860
|
|
|
134.
|
|
|
-q --brief Output only whether files differ.
|
|
|
|
|
-q --brief 只显示文件是否不同。
|
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/diff.c:865
|
|
|
135.
|
|
|
-e --ed Output an ed script.
|
|
|
|
|
-e --ed 以 ed script 方式输出。
|
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/diff.c:866
|
|
|
136.
|
|
|
--normal Output a normal diff.
|
|
|
|
|
--normal 以正常的 diff 方式输出。
|
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/diff.c:867
|
|
|
137.
|
|
|
-n --rcs Output an RCS format diff.
|
|
|
|
|
-n --rcs 以 RCS diff 格式输出。
|
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/diff.c:868
|
|
|
138.
|
|
|
-y --side-by-side Output in two columns.
-W NUM --width=NUM Output at most NUM (default 130) print columns.
--left-column Output only the left column of common lines.
--suppress-common-lines Do not output common lines. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
-y --side-by-side 以两列并排的方式显示。
-W NUM --width=NUM 每行显示最多 NUM (默认 130) 个字符。
--left-column 当有两行相同时只显示左边的一行。
--suppress-common-lines 当有两行相同时不会显示。 |
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/diff.c:869
|
|
|
139.
|
|
|
-D NAME --ifdef=NAME Output merged file to show `#ifdef NAME' diffs.
|
|
|
|
|
-D NAME --ifdef=NAME 输出的内容以‘#ifdef NAME’方式标明差异。
|
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/diff.c:873
|
|
|
140.
|
|
|
--GTYPE-group-format=GFMT Similar, but format GTYPE input groups with GFMT.
|
|
|
|
|
--GTYPE-group-format=GFMT 效果类似，但会以 GFMT 格式处理 GTYPE 输入的行。
|
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/diff.c:874
|
|
|
141.
|
|
|
--line-format=LFMT Similar, but format all input lines with LFMT.
|
|
|
|
|
--line-format=LFMT 效果类似，但会以 LFMT 格式处理每一行资料。
|
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/diff.c:875
|
|
|
142.
|
|
|
--LTYPE-line-format=LFMT Similar, but format LTYPE input lines with LFMT.
|
|
|
|
|
--LTYPE-line-format=LFMT 效果类似，但会以 LFMT 格式处理 LTYPE 输入的行。
|
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/diff.c:876
|
