|
193.
|
|
|
-A, --show-all output all changes, bracketing conflicts
|
|
|
|
-A, --show-all Alle Änderungen ausgeben, Konflikte in Klammern.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:478
|
|
194.
|
|
|
-e, --ed output ed script incorporating changes
from OLDFILE to YOURFILE into MYFILE
|
|
|
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.
|
|
|
|
-e, --ed ed-Script ausgeben, das die Änderungen
von ALTEDATEI hin zu DEINEDATEI in
MEINEDATEI integriert.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:480
|
|
195.
|
|
|
-E, --show-overlap like -e, but bracket conflicts
|
|
|
|
-E --show-overlap Wie -e, aber Konflikte in Klammern.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:482
|
|
196.
|
|
|
-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
|
|
197.
|
|
|
-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
|
|
198.
|
|
|
-X like -x, but bracket conflicts
|
|
|
|
-X Wie -x, aber Konflikte in Klammern.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:485
|
|
199.
|
|
|
-i append 'w' and 'q' commands to ed scripts
|
|
|
|
-i An ed-Skripte »w«- und »q«-Befehle anhängen.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:486
|
|
200.
|
|
|
-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
|
|
201.
|
|
|
-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
|
|
202.
|
|
|
--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
|