#
#
# patch "options.cc"
#  from [0d4225ed7751e38a154f3d6d72cabbf9d57de9df]
#    to [d43238f99005a8476259c53805b7e1f9bc0cae63]
# 
# patch "options_list.hh"
#  from [287265d7472e45c25775ee9e712dc6f1a98c210a]
#    to [d9c478583ace2d86646cb78d3e721b213f61d6b8]
#
============================================================
--- options.cc	0d4225ed7751e38a154f3d6d72cabbf9d57de9df
+++ options.cc	d43238f99005a8476259c53805b7e1f9bc0cae63
@@ -190,7 +190,7 @@ options::options_type const & options::o
   void options::reset_opt_ ## name ()                                   \
   {                                                                     \
     name ## _given = false;                                             \
-    reset_optset(&opts:: name ## _opt);                                 \
+    reset_optset(&opts:: optset);                                       \
   }                                                                     \
   void options::set_ ## name (std::string arg)                          \
   {                                                                     \
============================================================
--- options_list.hh	287265d7472e45c25775ee9e712dc6f1a98c210a
+++ options_list.hh	d9c478583ace2d86646cb78d3e721b213f61d6b8
@@ -576,7 +576,7 @@ SIMPLE_OPTION(no_merges, "no-merges", bo
 SIMPLE_OPTION(no_merges, "no-merges", bool,
               gettext_noop("exclude merges when printing logs"))
 
-GLOBAL_SIMPLE_OPTION(norc, "norc", bool,
+GLOBAL_SIMPLE_OPTION(norc, "norc/yesrc", bool,
                      gettext_noop("do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files"))
 
 GLOBAL_SIMPLE_OPTION(nostd, "nostd", bool,