|
|
187.
|
|
|
-L LABEL --label=LABEL Use LABEL instead of file name.
|
|
|
|
|
-L 标识 --label=标识 以<标识>代替文件名称。
|
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/diff3.c:437
|
|
|
188.
|
|
|
-i Append `w' and `q' commands to ed scripts.
|
|
|
|
|
-i 在 ed script 中附加‘w’和‘q’指令。
|
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/diff3.c:438
|
|
|
189.
|
|
|
--diff-program=PROGRAM Use PROGRAM to compare files.
|
|
|
|
|
--diff-program=程序 用<程序>来比较文件。
|
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/diff3.c:442 src/sdiff.c:213
|
|
|
190.
|
|
|
Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE 
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
用法： %s [选项]... 我的文件 旧文件 你的文件
|
|
Translated by
Mingye Wang
|
|
|
|
Located in
src/diff3.c:508
|
|
|
191.
|
|
|
Compare three files line by line.
|
|
|
|
|
逐行比较三个文件。
|
|
Translated by
Yingxin Zhou
|
|
|
|
Located in
src/diff3.c:510
|
|
|
192.
|
|
|
Exit status is 0 if successful, 1 if conflicts, 2 if trouble.
|
|
|
|
|
退出状态为 0 表示成功，1 表示有冲突，2 表示有错误发生。
|
|
Translated by
Wenbin Lv
|
|
|
|
Located in
src/diff3.c:532
|
|
|
193.
|
|
|
internal error: screwup in format of diff blocks
|
|
|
|
|
内部错误：diff 块的格式出错
|
|
Translated by
Wenbin Lv
|
|
|
|
Located in
src/diff3.c:725
|
|
|
194.
|
|
|
%s: diff failed:
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
|
%s: diff 失败：
|
|
Translated by
Wenbin Lv
|
|
|
|
Located in
src/diff3.c:1015
|
|
|
195.
|
|
|
internal error: invalid diff type in process_diff
|
|
|
|
|
内部错误：process_diff 中的 diff 类型无效
|
|
Translated and reviewed by
Wylmer Wang
|
|
|
|
Located in
src/diff3.c:1037
|
|
|
196.
|
|
|
invalid diff format; invalid change separator
|
|
|
|
|
无效的 diff 格式；无效的变更分隔符
|
|
Translated by
Wenbin Lv
|
|
|
|
Located in
src/diff3.c:1060
|
