# 
# patch "ChangeLog"
#  from [ea8f43287b62029afd6f494d7ead08be177ae6c0]
#    to [a0b2e6ee137dd081a8df4c00fc7bda706298da41]
# 
# patch "monotone.cc"
#  from [3db5da40dab63271ab49a64bb685823a9f2920e9]
#    to [782b35a9ade9f837769f74448cbd749f506b07a6]
# 
========================================================================
--- ChangeLog	ea8f43287b62029afd6f494d7ead08be177ae6c0
+++ ChangeLog	a0b2e6ee137dd081a8df4c00fc7bda706298da41
@@ -1,3 +1,7 @@
+2005-09-02  Matthew Gregan  <address@hidden>
+
+	* monotone.cc: Use consistent case in option descriptions.
+
 2005-09-01  Timothy Brownawell  <address@hidden>
 
 	* lua.cc, std_hooks.lua: use proper regexes for .mt-ignore
========================================================================
--- monotone.cc	3db5da40dab63271ab49a64bb685823a9f2920e9
+++ monotone.cc	782b35a9ade9f837769f74448cbd749f506b07a6
@@ -62,12 +62,12 @@
     {"no-merges", 0, POPT_ARG_NONE, NULL, OPT_NO_MERGES, gettext_noop("skip merges when printing logs"), NULL},
     {"set-default", 0, POPT_ARG_NONE, NULL, OPT_SET_DEFAULT, gettext_noop("use the current arguments as the future default"), NULL},
     {"exclude", 0, POPT_ARG_STRING, &argstr, OPT_EXCLUDE, gettext_noop("leave out branches matching a pattern"), NULL},
-    {"unified", 0, POPT_ARG_NONE, NULL, OPT_UNIFIED_DIFF, gettext_noop("Use unified diff format"), NULL},
-    {"context", 0, POPT_ARG_NONE, NULL, OPT_CONTEXT_DIFF, gettext_noop("Use context diff format"), NULL},
-    {"external", 0, POPT_ARG_NONE, NULL, OPT_EXTERNAL_DIFF, gettext_noop("Use external diff hook for generating diffs"), NULL},
-    {"diff-args", 0, POPT_ARG_STRING, &argstr, OPT_EXTERNAL_DIFF_ARGS, gettext_noop("Argument to pass external diff hook"), NULL},
-    {"lca", 0, POPT_ARG_NONE, NULL, OPT_LCA, gettext_noop("Use least common ancestor as ancestor for merge"), NULL},
-    {"execute", 'e', POPT_ARG_NONE, NULL, OPT_EXECUTE, gettext_noop("Perform the associated file operation"), NULL},
+    {"unified", 0, POPT_ARG_NONE, NULL, OPT_UNIFIED_DIFF, gettext_noop("use unified diff format"), NULL},
+    {"context", 0, POPT_ARG_NONE, NULL, OPT_CONTEXT_DIFF, gettext_noop("use context diff format"), NULL},
+    {"external", 0, POPT_ARG_NONE, NULL, OPT_EXTERNAL_DIFF, gettext_noop("use external diff hook for generating diffs"), NULL},
+    {"diff-args", 0, POPT_ARG_STRING, &argstr, OPT_EXTERNAL_DIFF_ARGS, gettext_noop("argument to pass external diff hook"), NULL},
+    {"lca", 0, POPT_ARG_NONE, NULL, OPT_LCA, gettext_noop("use least common ancestor as ancestor for merge"), NULL},
+    {"execute", 'e', POPT_ARG_NONE, NULL, OPT_EXECUTE, gettext_noop("perform the associated file operation"), NULL},
     { NULL, 0, 0, NULL, 0, NULL, NULL }
   };