# 
# 
# patch "ChangeLog"
#  from [6496500ec37be58b8a6d9939e20b59d965c9cb6d]
#    to [f13a903faafece1cd7406781fc73382ed4a5e4ed]
# 
# patch "monotone.cc"
#  from [8d46fa4daee40f9d1da60d5b251c8d6deebe2ce2]
#    to [1801c2b628b186e15a9ff6aec52607b1735185ab]
# 
============================================================
--- ChangeLog	6496500ec37be58b8a6d9939e20b59d965c9cb6d
+++ ChangeLog	f13a903faafece1cd7406781fc73382ed4a5e4ed
@@ -1,5 +1,9 @@
 2006-07-05  Nathaniel Smith  <address@hidden>
 
+	* monotone.cc (cpp_main): Tyop in previous commit.
+
+2006-07-05  Nathaniel Smith  <address@hidden>
+
 	* commands.cc (complete_command): 
 	* monotone.cc (cpp_main): Minor code cleanups.
 
============================================================
--- monotone.cc	8d46fa4daee40f9d1da60d5b251c8d6deebe2ce2
+++ monotone.cc	1801c2b628b186e15a9ff6aec52607b1735185ab
@@ -599,7 +599,7 @@
         // no command given
         throw usage("");
       // poptPeekArg returned true, so we can call poptGetArg
-      string cmd = commands::complete_command(poptGetArg(ctx));
+      string cmd = commands::complete_command(poptGetArg(ctx()));
 
       // stop here if they asked for help