- 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.

4 files changed, 45 insertions, 50 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"
 
diff --git a/po/fr.po b/po/fr.po
index c95cda9..f575a14 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -315,8 +315,7 @@ msgstr ""
 msgid ""
 "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
-"Les options «--combine», «--snapshot» et «-z» ne peuvent pas être combinées."
-"\\n"
+"Les options «--combine», «--snapshot» et «-z» ne peuvent pas être combinées.\\n"
 
 #: quilt/diff.in:232
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
@@ -999,7 +998,7 @@ msgstr "Aucun patch retiré\\n"
 msgid "No patches applied\\n"
 msgstr "Aucun patch n'est appliqué\\n"
 
-#: quilt/pop.in:268 quilt/push.in:383
+#: quilt/pop.in:268 quilt/push.in:381
 msgid "Now at patch %s\\n"
 msgstr "Le patch %s est maintenant au sommet\\n"
 
@@ -1051,9 +1050,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"
@@ -1093,36 +1091,36 @@ msgstr ""
 "\tApplique une coloration syntaxique, toujours («always»), de manière\n"
 "\tautomatique («auto») ou jamais («never»).\n"
 
-#: quilt/push.in:67
+#: quilt/push.in:66
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "Interrompu par l'utilisateur ; le patch %s n'a pas été appliqué.\\n"
 
-#: quilt/push.in:173
+#: quilt/push.in:172
 msgid "Applying patch %s\\n"
 msgstr "Application de %s\\n"
 
-#: quilt/push.in:208
+#: quilt/push.in:207
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "Le patch %s n'existe pas ; patch vide appliqué\\n"
 
-#: quilt/push.in:212
+#: quilt/push.in:211
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "Le patch %s semble vide. Il a été appliqué.\\n"
 
-#: quilt/push.in:216
+#: quilt/push.in:215
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "%s a été appliqué (forcé ; vous devriez le rafraîchir)\\n"
 
-#: quilt/push.in:226
+#: quilt/push.in:225
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "Le patch %s peut être appliqué à l'envers\\n"
 
-#: quilt/push.in:229
+#: quilt/push.in:228
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr ""
 "Le patch %s ne s'applique pas proprement (forcez l'application avec -f)\\n"
 
-#: quilt/push.in:363
+#: quilt/push.in:361
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Le patch au sommet %s doit être rafraichi au préalable.\\n"
 
diff --git a/po/ja.po b/po/ja.po
index fa013ba..9a4ad56 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -964,7 +964,7 @@ msgstr "適用されているパッチはありません\\n"
 msgid "No patches applied\\n"
 msgstr "適用されているパッチはありません\\n"
 
-#: quilt/pop.in:268 quilt/push.in:383
+#: quilt/pop.in:268 quilt/push.in:381
 msgid "Now at patch %s\\n"
 msgstr "現在位置はパッチ %s です\\n"
 
@@ -1014,9 +1014,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"
@@ -1053,36 +1052,36 @@ msgstr ""
 "        シンタックスの色付けを行なう。\n"
 "\n"
 
-#: quilt/push.in:67
+#: quilt/push.in:66
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "ユーザによって中断されました。パッチ %s は適用されていません。\\n"
 
-#: quilt/push.in:173
+#: quilt/push.in:172
 msgid "Applying patch %s\\n"
 msgstr "パッチ %s を適用しています\\n"
 
-#: quilt/push.in:208
+#: quilt/push.in:207
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "パッチ %s は存在しません。空のパッチを適用しました\\n"
 
-#: quilt/push.in:212
+#: quilt/push.in:211
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "パッチ %s は空のようですが、適用しました\\n"
 
-#: quilt/push.in:216
+#: quilt/push.in:215
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr ""
 "パッチ %s を適用しました (強制適用したために、リフレッシュが必要です)\\n"
 
-#: quilt/push.in:226
+#: quilt/push.in:225
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "パッチ %s は、反転して適用することができます\\n"
 
-#: quilt/push.in:229
+#: quilt/push.in:228
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "パッチ %s が適用できません (強制適用する場合は -fを付けてください)\\n"
 
-#: quilt/push.in:363
+#: quilt/push.in:361
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "最上位パッチのリフレッシュが最初に必要です。\\n"
 
diff --git a/po/quilt.pot b/po/quilt.pot
index 11fc782..ae65c3d 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -669,7 +669,7 @@ msgstr ""
 msgid "No patches applied\\n"
 msgstr ""
 
-#: quilt/pop.in:268 quilt/push.in:383
+#: quilt/pop.in:268 quilt/push.in:381
 msgid "Now at patch %s\\n"
 msgstr ""
 
@@ -712,9 +712,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"
@@ -724,35 +723,35 @@ msgid ""
 "\tUse syntax coloring.\n"
 msgstr ""
 
-#: quilt/push.in:67
+#: quilt/push.in:66
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr ""
 
-#: quilt/push.in:173
+#: quilt/push.in:172
 msgid "Applying patch %s\\n"
 msgstr ""
 
-#: quilt/push.in:208
+#: quilt/push.in:207
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr ""
 
-#: quilt/push.in:212
+#: quilt/push.in:211
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr ""
 
-#: quilt/push.in:216
+#: quilt/push.in:215
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr ""
 
-#: quilt/push.in:226
+#: quilt/push.in:225
 msgid "Patch %s can be reverse-applied\\n"
 msgstr ""
 
-#: quilt/push.in:229
+#: quilt/push.in:228
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr ""
 
-#: quilt/push.in:363
+#: quilt/push.in:361
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr ""