# 
# patch "ChangeLog"
#  from [f417b9fea8a25a4bb03472b8d2ee1e77e7649499]
#    to [45dbe7f8947f92d0cc5c5778c7feba14a920cc41]
# 
# patch "monotone.cc"
#  from [782b35a9ade9f837769f74448cbd749f506b07a6]
#    to [291306710a0ba85648b1d19709e22644b089f8a4]
# 
========================================================================
--- ChangeLog	f417b9fea8a25a4bb03472b8d2ee1e77e7649499
+++ ChangeLog	45dbe7f8947f92d0cc5c5778c7feba14a920cc41
@@ -1,5 +1,11 @@
 2005-09-04  Nathaniel Smith  <address@hidden>
 
+	* monotone.cc (options): Remove default from the help string for
+	--count, since none of the options listed are actually the
+	default.
+
+2005-09-04  Nathaniel Smith  <address@hidden>
+
 	* tests/t_unreadable_db.at, testsuite.at: New test.
 
 2005-09-03  Nathaniel Smith  <address@hidden>
========================================================================
--- monotone.cc	782b35a9ade9f837769f74448cbd749f506b07a6
+++ monotone.cc	291306710a0ba85648b1d19709e22644b089f8a4
@@ -83,7 +83,7 @@
     {"version", 0, POPT_ARG_NONE, NULL, OPT_VERSION, gettext_noop("print version number, then exit"), NULL},
     {"full-version", 0, POPT_ARG_NONE, NULL, OPT_FULL_VERSION, gettext_noop("print detailed version number, then exit"), NULL},
     {"xargs", '@', POPT_ARG_STRING, &argstr, OPT_ARGFILE, gettext_noop("insert command line arguments taken from the given file"), NULL},
-    {"ticker", 0, POPT_ARG_STRING, &argstr, OPT_TICKER, gettext_noop("set ticker style (count|dot|none) [count]"), NULL},
+    {"ticker", 0, POPT_ARG_STRING, &argstr, OPT_TICKER, gettext_noop("set ticker style (count|dot|none)"), NULL},
     {"nostd", 0, POPT_ARG_NONE, NULL, OPT_NOSTD, gettext_noop("do not load standard lua hooks"), NULL},
     {"norc", 0, POPT_ARG_NONE, NULL, OPT_NORC, gettext_noop("do not load ~/.monotone/monotonerc or MT/monotonerc lua files"), NULL},
     {"rcfile", 0, POPT_ARG_STRING, &argstr, OPT_RCFILE, gettext_noop("load extra rc file"), NULL},