#
#
# patch "cmd_merging.cc"
#  from [516067349bcc91e3955427cf7c1b0087d8ed5889]
#    to [979f3f84c3e2c1740ae419b728b90c2fc6ffcbee]
# 
# patch "roster_merge.cc"
#  from [48329b05521b778cfb6af538cc9905d4c65bc2dd]
#    to [78e23a1381bbc2f2ba604f09f53b2dd6bfd18344]
#
============================================================
--- cmd_merging.cc	516067349bcc91e3955427cf7c1b0087d8ed5889
+++ cmd_merging.cc	979f3f84c3e2c1740ae419b728b90c2fc6ffcbee
@@ -496,7 +496,7 @@ CMD(merge, "merge", "", CMD_REF(tree), "
     }
 
   if (heads.size() > 1)
-    P(F("note: branch '%s' still has %s heads; run merge again") % app.opts.branchname % heads.size());
+    P(F("note: branch '%s' still has %d heads; run merge again") % app.opts.branchname % heads.size());
 
   P(F("note: your workspaces have not been updated"));
 }
@@ -960,8 +960,8 @@ show_conflicts_core (database & db,
         {
           int const count = result.count_unsupported_resolution();
           if (count > 0)
-            P(FP("warning: %s conflict with no supported resolutions.",
-                 "warning: %s conflicts with no supported resolutions.",
+            P(FP("warning: %d conflict with no supported resolutions.",
+                 "warning: %d conflicts with no supported resolutions.",
                  count) % count);
         }
     }
============================================================
--- roster_merge.cc	48329b05521b778cfb6af538cc9905d4c65bc2dd
+++ roster_merge.cc	78e23a1381bbc2f2ba604f09f53b2dd6bfd18344
@@ -2179,7 +2179,7 @@ validate_file_content_conflicts(basic_io
       read_file_content_conflict(pars, file_conflict, left_roster, right_roster);
 
       N(merge_conflict.nid == file_conflict.nid,
-        F("conflicts_mismatch_msg"));
+        F(conflicts_mismatch_msg));
 
       merge_conflict.resolution = file_conflict.resolution;