#
#
# patch "monotone.cc"
#  from [3adf3e2787f7ba5d1ff9aa2907559b35f2421bbd]
#    to [6833dc2929eb38b5b4ef465e0d45692503be1f08]
#
============================================================
--- monotone.cc	3adf3e2787f7ba5d1ff9aa2907559b35f2421bbd
+++ monotone.cc	6833dc2929eb38b5b4ef465e0d45692503be1f08
@@ -286,16 +286,21 @@ cpp_main(int argc, char ** argv)
             visibleid = join_words(vector< utf8 >(u.which.begin() + 1,
                                                   u.which.end()))();
 
-          usage_stream << F("Usage: %s [OPTION...] command [ARG...]") % ui.prog_name << "\n\n";
-          usage_stream << options::opts::globals().instantiate(&app.opts).get_usage_str() << '\n';
+          usage_stream << F("Usage: %s [OPTION...] command [ARG...]") %
+                          ui.prog_name << "\n\n";
+          usage_stream << options::opts::globals().instantiate(&app.opts).
+                          get_usage_str() << '\n';
 
           // Make sure to hide documentation that's not part of
           // the current command.
-          options::options_type cmd_options = commands::command_options(u.which);
+          options::options_type cmd_options =
+            commands::command_options(u.which);
           if (!cmd_options.empty())
             {
-              usage_stream << F("Options specific to '%s %s':") % ui.prog_name % visibleid << "\n\n";
-              usage_stream << cmd_options.instantiate(&app.opts).get_usage_str() << '\n';
+              usage_stream << F("Options specific to '%s %s':") %
+                              ui.prog_name % visibleid << "\n\n";
+              usage_stream << cmd_options.instantiate(&app.opts).
+                              get_usage_str() << '\n';
             }
 
           commands::explain_usage(u.which, usage_stream);