#
#
# patch "commands.cc"
#  from [03612a96ebcb165144d602f09a96344771522963]
#    to [52ac43cdc4493760010eb0a05e4d27eca3887ebb]
# 
# patch "monotone.cc"
#  from [2782860a666c0c8c6afad5b9eaf674ffa2f19991]
#    to [d0ec43295366c930d574c3852e3efab8596eb15c]
#
============================================================
--- commands.cc	03612a96ebcb165144d602f09a96344771522963
+++ commands.cc	52ac43cdc4493760010eb0a05e4d27eca3887ebb
@@ -508,7 +508,7 @@ namespace commands
     else
       {
         N(!cmd.empty(),
-          F("unknown command '%s'") % cmd);
+          F("unknown command '%s'") % idx(cmdline, 0));
         return options::options_type();
       }
   }
============================================================
--- monotone.cc	2782860a666c0c8c6afad5b9eaf674ffa2f19991
+++ monotone.cc	d0ec43295366c930d574c3852e3efab8596eb15c
@@ -137,7 +137,7 @@ string read_options(options & opts, vect
     {
       cmd = commands::complete_command(idx(opts.args, 0)());
       N(!cmd.empty(),
-        F("unknown command '%s'") % cmd);
+        F("unknown command '%s'") % idx(opts.args, 0)());
     }
 
   // reparse options, now that we know what command-specific