|
220.
|
|
|
-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
|
|
221.
|
|
|
-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
|
|
222.
|
|
|
--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
|
|
223.
|
|
|
-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
|
|
224.
|
|
|
--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
|
|
225.
|
|
|
-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
|
|
226.
|
|
|
--help display this help and exit
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
--help Diese Hilfe anzeigen und beenden.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:498
|
|
227.
|
|
|
-v, --version output version information and exit
|
|
|
|
-v, --version Versionsinformation ausgeben und beenden.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:499
|
|
228.
|
|
|
Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Aufruf: %s [OPTION]... MEINEDATEI ALTEDATEI DEINEDATEI
|
|
Translated by
Hendrik Schrieber
|
In upstream: |
|
Benutzung: %s [OPTION]... MEINEDATEI ALTEDATEI DEINEDATEI
|
|
|
Suggested by
Martin v. Löwis
|
|
|
|
Located in
src/diff3.c:508
|
|
229.
|
|
|
Compare three files line by line.
|
|
|
|
Drei Dateien Zeile für Zeile vergleichen.
|
|
Translated and reviewed by
Martin v. Löwis
|
|
|
|
Located in
src/diff3.c:510
|