#
#
# patch "commands.cc"
#  from [64ecb6b65dc7922f9cea68f0016f961dbf3dd267]
#    to [dcc5cd4f304b864e0b947a3c3e2a6087ace6fc9b]
# 
# patch "commands.hh"
#  from [d17b0cdfffe5affe3c314ded94366e5255e0948e]
#    to [23cd185ee52305c33ef1dc78e617bd8af51fae35]
# 
# patch "monotone.cc"
#  from [36b847fc599875695adfd6a14288b8253f1aea02]
#    to [3adf3e2787f7ba5d1ff9aa2907559b35f2421bbd]
#
============================================================
--- commands.cc	64ecb6b65dc7922f9cea68f0016f961dbf3dd267
+++ commands.cc	dcc5cd4f304b864e0b947a3c3e2a6087ace6fc9b
@@ -750,13 +750,6 @@ namespace commands
     command * cmd = find_command(ident);
     return cmd->opts();
   }
-
-  // XXX How does this differ from command_options()?
-  options::options_type toplevel_command_options(command_id const & ident)
-  {
-    command * cmd = find_command(ident);
-    return cmd->opts();
-  }
 }
 ////////////////////////////////////////////////////////////////////////
 
============================================================
--- commands.hh	d17b0cdfffe5affe3c314ded94366e5255e0948e
+++ commands.hh	23cd185ee52305c33ef1dc78e617bd8af51fae35
@@ -29,7 +29,6 @@ namespace commands {
   int process(app_state & app, command_id const & ident,
               args_vector const & args);
   options::options_type command_options(command_id const & ident);
-  options::options_type toplevel_command_options(command_id const & ident);
 };
 
 struct usage
============================================================
--- monotone.cc	36b847fc599875695adfd6a14288b8253f1aea02
+++ monotone.cc	3adf3e2787f7ba5d1ff9aa2907559b35f2421bbd
@@ -291,7 +291,7 @@ cpp_main(int argc, char ** argv)
 
           // Make sure to hide documentation that's not part of
           // the current command.
-          options::options_type cmd_options = commands::toplevel_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";