#
#
# patch "cmd_merging.cc"
#  from [1ee002f467d430ba43200e7f614cdf7e571049f5]
#    to [8c83032c21fe3f890b8215efd89f4efecebc8bd8]
# 
# patch "cmd_packet.cc"
#  from [c40a801e198267ed71bd9f248e56068833c26c6e]
#    to [250e7188d51581406f9d28753c798754125abe4f]
#
============================================================
--- cmd_merging.cc	1ee002f467d430ba43200e7f614cdf7e571049f5
+++ cmd_merging.cc	8c83032c21fe3f890b8215efd89f4efecebc8bd8
@@ -1126,7 +1126,7 @@ CMD_AUTOMATE(show_conflicts, N_("[LEFT_R
 //   two heads, prints an error message to stderr and exits with status 1.
 //
 CMD_AUTOMATE(show_conflicts, N_("[LEFT_REVID RIGHT_REVID]"),
-             N_("Shows the conflicts between two revisions."),
+             N_("Shows the conflicts between two revisions"),
              N_("If no arguments are given, LEFT_REVID and RIGHT_REVID default to the "
                 "first two heads that would be chosen by the 'merge' command."),
              options::opts::branch | options::opts::ignore_suspend_certs)
@@ -1141,7 +1141,7 @@ CMD(store, "store", "", CMD_REF(conflict
 
 CMD(store, "store", "", CMD_REF(conflicts),
     "[LEFT_REVID RIGHT_REVID]",
-    N_("Store the conflicts from merging two revisions."),
+    N_("Store the conflicts from merging two revisions"),
     N_("If no arguments are given, LEFT_REVID and RIGHT_REVID default to the "
        "first two heads that would be chosen by the 'merge' command. If "
        "--conflicts-file is not given, '_MTN/conflicts' is used."),
============================================================
--- cmd_packet.cc	c40a801e198267ed71bd9f248e56068833c26c6e
+++ cmd_packet.cc	250e7188d51581406f9d28753c798754125abe4f
@@ -174,7 +174,7 @@ CMD_AUTOMATE(read_packets, N_("PACKET-DA
 // Error conditions:
 //   Invalid input formatting.
 CMD_AUTOMATE(read_packets, N_("PACKET-DATA"),
-             N_("Load the given packets into the database."),
+             N_("Load the given packets into the database"),
              "",
              options::opts::none)
 {