|
230.
|
|
|
![](/@@/translation-newline)
The default output format is a somewhat human-readable representation of ![](/@@/translation-newline)
the changes.
![](/@@/translation-newline)
The -e, -E, -x, -X (and corresponding long) options cause an ed script ![](/@@/translation-newline)
to be output instead of the default.
![](/@@/translation-newline)
Finally, the -m (--merge) option causes diff3 to do the merge internally ![](/@@/translation-newline)
and output the actual merged file. For unusual input, this is more ![](/@@/translation-newline)
robust than using ed.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
![](/@@/translation-newline)
Das Standardausgabeformat ist eine einigermaßen menschenlesbare ![](/@@/translation-newline)
Darstellung der Änderungen.
![](/@@/translation-newline)
Die Optionen -e, -E, -x und -X (und deren entsprechende lange Versionen) ![](/@@/translation-newline)
erzeugen ein ed-Skript als Ausgabe statt des Standards.
![](/@@/translation-newline)
Abschließend versucht die Option -m (--merge), dass diff3 die Änderungen ![](/@@/translation-newline)
intern zusammenführt und die eigentliche, zusammengeführte Datei ausgegeben ![](/@@/translation-newline)
wird. Für ungewöhnliche Eingaben ist dies robuster, als ed zu benutzen.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:520
|
|
231.
|
|
|
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 ![](/@@/translation-newline)
es Konflikte gibt und 2 falls Probleme auftreten.
|
|
Translated by
Hendrik Schrieber
|
|
|
|
Located in
src/diff3.c:532
|
|
232.
|
|
|
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
|
|
233.
|
|
|
%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
|
|
234.
|
|
|
internal error: invalid diff type in process_diff
|
|
|
|
Interner Fehler: Ungültiger diff-Typ in process_diff.
|
|
Translated and reviewed by
Martin v. Löwis
|
|
|
|
Located in
src/diff3.c:1037
|
|
235.
|
|
|
invalid diff format; invalid change separator
|
|
|
|
Ungültiges Diff-Format; ungültiger Änderungstrenner.
|
|
Translated and reviewed by
Martin v. Löwis
|
|
|
|
Located in
src/diff3.c:1060
|
|
236.
|
|
|
invalid diff format; incomplete last line
|
|
|
|
Ungültiges Diff-Format; unvollständige letzte Zeile.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:1294
|
|
237.
|
|
|
subsidiary program '%s ' could not be invoked
|
|
|
|
Unterprogramm »%s « konnte nicht aufgerufen werden.
|
|
Translated by
Jakob Kramer
|
|
|
|
Located in
src/diff3.c:1318 src/sdiff.c:274 src/util.c:1069
|
|
238.
|
|
|
invalid diff format; incorrect leading line chars
|
|
|
|
Ungültiges Diff-Format; inkorrektes führendes Zeichen in Zeile.
|
|
Translated by
Mario Blättermann
|
|
|
|
Located in
src/diff3.c:1343
|
|
239.
|
|
|
internal error: invalid diff type passed to output
|
|
|
|
Interner Fehler: Ungültiger diff-Typ an Ausgabe übergeben.
|
|
Translated and reviewed by
Martin v. Löwis
|
|
|
|
Located in
src/diff3.c:1416
|