|
204.
|
|
|
--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
|
|
205.
|
|
|
-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
|
|
206.
|
|
|
--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
|
|
207.
|
|
|
-v, --version output version information and exit
|
|
|
|
-v, --version Versionsinformation ausgeben und beenden.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:499
|
|
208.
|
|
|
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
|
|
209.
|
|
|
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
|
|
210.
|
|
|
The default output format is a somewhat human-readable representation of
the changes.
The -e, -E, -x, -X (and corresponding long) options cause an ed script
to be output instead of the default.
Finally, the -m (--merge) option causes diff3 to do the merge internally
and output the actual merged file. For unusual input, this is more
robust than using ed.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Das Standardausgabeformat ist eine einigermaßen menschenlesbare
Darstellung der Änderungen.
Die Optionen -e, -E, -x und -X (und deren entsprechende lange Versionen)
erzeugen ein ed-Skript als Ausgabe statt des Standards.
Abschließend versucht die Option -m (--merge), dass diff3 die Änderungen
intern zusammenführt und die eigentliche, zusammengeführte Datei ausgegeben
wird. Für ungewöhnliche Eingaben ist dies robuster, als ed zu benutzen.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:520
|
|
211.
|
|
|
Exit status is 0 if successful, 1 if conflicts, 2 if trouble.
|
|
|
|
Der Rückgabewert des Programms ist 0, falls es erfolgreich ist, 1 falls
es Konflikte gibt und 2 falls Probleme auftreten.
|
|
Translated by
Hendrik Schrieber
|
|
|
|
Located in
src/diff3.c:532
|
|
212.
|
|
|
internal error: screwup in format of diff blocks
|
|
|
|
Interner Fehler: Format für diff-Blöcke ist durcheinander.
|
|
Translated and reviewed by
Martin v. Löwis
|
|
|
|
Located in
src/diff3.c:725
|
|
213.
|
|
|
%s : diff failed:
|
|
|
represents a space character.
Enter a space in the equivalent position in the translation.
|
|
|
|
%s : »diff« ist gescheitert:
|
|
Translated and reviewed by
Martin v. Löwis
|
|
|
|
Located in
src/diff3.c:1015
|