|
194.
|
|
|
-3, --easy-only like -e, but incorporate only nonoverlapping changes
|
|
|
|
-3, --easy-only Wie -e, aber nur nichtüberlappende Änderungen
integrieren.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:483
|
|
195.
|
|
|
-x, --overlap-only like -e, but incorporate only overlapping changes
|
|
|
|
-x, --overlap-only Wie -e, aber nur überlappende Änderungen
integrieren.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:484
|
|
196.
|
|
|
-X like -x, but bracket conflicts
|
|
|
|
-X Wie -x, aber Konflikte in Klammern.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:485
|
|
197.
|
|
|
-i append `w' and `q' commands to ed scripts
|
|
|
|
-i An ed-Skripte »w«- und »q«-Befehle anhängen.
|
|
Translated by
Hendrik Schrieber
|
|
|
|
Located in
src/diff3.c:436
|
|
198.
|
|
|
-m, --merge output actual merged file, according to
-A if no other options are given
|
|
|
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.
|
|
|
|
-m, --merge Zusammengefügte Datei ausgeben, wie -A,
falls keine anderen Optionen übergeben wurden.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:488
|
|
199.
|
|
|
-a, --text treat all files as text
|
|
|
|
-a, --text Alle Dateien als Text behandeln.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:491
|
|
200.
|
|
|
--strip-trailing-cr strip trailing carriage return on input
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
--strip-trailing-cr Wagenrücklauf (CR) am Zeilenende beim Einlesen
entfernen.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:492
|
|
201.
|
|
|
-T, --initial-tab make tabs line up by prepending a tab
|
|
|
|
-T, --initial-tab Einrückungen durch vorangestellte Tabulatoren
erzeugen.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:493
|
|
202.
|
|
|
--diff-program=PROGRAM use PROGRAM to compare files
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
--diff-program=PROGRAMM PROGRAMM zum Vergleichen von Dateien verwenden.
|
|
Translated by
Hendrik Schrieber
|
|
|
|
Located in
src/diff3.c:494
|
|
203.
|
|
|
-L, --label=LABEL use LABEL instead of file name
(can be repeated up to three times)
|
|
|
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.
|
|
|
|
-L, --label=LABEL LABEL statt des Dateinamens benutzen
(kann bis zu dreimal wiederholt werden)
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:495
|