#
#
# patch "merge.cc"
#  from [5110775ef0a938c14246f95abd33a6b97118baba]
#    to [4ebc61395a485c9eb2b2fd6e67eafa199fe5b39e]
#
============================================================
--- merge.cc	5110775ef0a938c14246f95abd33a6b97118baba
+++ merge.cc	4ebc61395a485c9eb2b2fd6e67eafa199fe5b39e
@@ -165,7 +165,9 @@ resolve_merge_conflicts(lua_hooks & lua,
       size_t remaining = result.file_content_conflicts.size();
       if (remaining > 0)
         {
-          P(F("%d content conflicts require user intervention") % remaining);
+          P(FP("%d content conflict requires user intervention",
+               "%d content conflicts require user intervention",
+               remaining) % remaining);
           result.report_file_content_conflicts(left_roster, right_roster, adaptor);
 
           try_to_merge_files(lua, left_roster, right_roster,