#
#
# patch "cmd_conflicts.cc"
#  from [62e726c9c01eafe340621f7932bd894b28a3c63f]
#    to [029018d86c11de95ce81fd36258a1480784a0121]
#
============================================================
--- cmd_conflicts.cc	62e726c9c01eafe340621f7932bd894b28a3c63f
+++ cmd_conflicts.cc	029018d86c11de95ce81fd36258a1480784a0121
@@ -125,8 +125,8 @@ show_conflicts(database & db, conflicts_
       {
         int const count = conflicts.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);
         else
           P(F("all conflicts resolved"));
@@ -138,8 +138,8 @@ show_conflicts(database & db, conflicts_
         int const count = conflicts.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);
 
             content_merge_database_adaptor adaptor