- Push command: don't imply --force when --merge is given so that

  a patch that doesn't merge cleanly will still require to
  spcify --force separately.  Update merge syntax highlighting.

1 files changed, 11 insertions, 12 deletions

diff --git a/po/de.po b/po/de.po
index b769d38..522d764 100644
--- a/po/de.po
+++ b/po/de.po
@@ -996,7 +996,7 @@ msgstr "Kein Patch entfernt\\n"
 msgid "No patches applied\\n"
 msgstr "Keine Patches angewandt\\n"
 
-#: quilt/pop.in:268 quilt/push.in:383
+#: quilt/pop.in:268 quilt/push.in:381
 msgid "Now at patch %s\\n"
 msgstr "Jetzt in Patch %s\\n"
 
@@ -1046,9 +1046,8 @@ msgid ""
 "--fuzz=N\n"
 "\tSet the maximum fuzz factor (default: 2).\n"
 "\n"
-"-M, --merge\n"
-"\tThree-way merge format: all changes are merged into the patched\n"
-"\tfiles (see diff3(1), merge(1)).\n"
+"-m, --merge\n"
+"\tMerge the patch file into the original files (see patch(1)).\n"
 "\n"
 "--leave-rejects\n"
 "\tLeave around the reject files patch produced, even if the patch\n"
@@ -1081,35 +1080,35 @@ msgstr ""
 "--color[=always|auto|never]\n"
 "\tSyntax-Einfärbung aktivieren (immer, automatisch, nie).\n"
 
-#: quilt/push.in:67
+#: quilt/push.in:66
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n"
 
-#: quilt/push.in:173
+#: quilt/push.in:172
 msgid "Applying patch %s\\n"
 msgstr "Wende Patch %s an\\n"
 
-#: quilt/push.in:208
+#: quilt/push.in:207
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "Patch %s existiert nicht; wende leeren patch an\\n"
 
-#: quilt/push.in:212
+#: quilt/push.in:211
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "Patch %s scheint leer zu sein; angewandt\\n"
 
-#: quilt/push.in:216
+#: quilt/push.in:215
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "Patch %s angewandt (erzwungen, muss aktualisiert werden (Refresh))\\n"
 
-#: quilt/push.in:226
+#: quilt/push.in:225
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "Patch %s kann verkehrt angewandt werden\\n"
 
-#: quilt/push.in:229
+#: quilt/push.in:228
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "Patch %s lässt sich nicht anwenden (erzwingen mit -f)\\n"
 
-#: quilt/push.in:363
+#: quilt/push.in:361
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Der oberste Patch %s muss zuerst aktualisiert werden (Refresh).\\n"