#
#
# patch "contrib/monoprof.sh"
#  from [a8c1041cfd7f06c57464bb2f07d893a2671ac702]
#    to [0c372d3806a279fe485946b206e63a970f4f745d]
# 
# patch "contrib/monotone-notify-hookversion.lua"
#  from [8c80ab093597940f427baf1e3c08d1274f9b84c4]
#    to [c21d57f58acc70452dc9ef46129d16455322b4b6]
# 
# patch "contrib/monotone.bash_completion"
#  from [1ec88d4a5ecb6f5f4f87f823f1bd4c594f699695]
#    to [7f13ba6199009a21bbbcdb3385ee9ac8f3ff220f]
# 
# patch "contrib/monotone.zsh_completion"
#  from [096ddfeacaa27baf509033c410e5ac0a57038a9f]
#    to [52d512cf02c5383be3ac7cd765f26f25a623e33a]
# 
# patch "lua-testsuite.lua"
#  from [9c66b41808f9ac679e81d29f533917bb8fd01aae]
#    to [705f0c0c86fc161772125c901d48e0b726c34670]
# 
# patch "monotone.texi"
#  from [c4402b63ac3d3061b85d5ca7788fe8fa31105adc]
#    to [6e5779012e99eb8ca8ac5aae7ab017a92e4d8425]
# 
# patch "options_list.hh"
#  from [b99caffc94e84284a23e3c8d1c49f2ab1790d24b]
#    to [e1c73654efd42c32cc74ec8014bbec1313d18fa0]
# 
# patch "tests/basic_invocation_and_options/__driver__.lua"
#  from [6f4177e3596bfd9c7156653bec64e09185cd8b39]
#    to [8ba8077add865a20f8e7e2d85673899595ec845e]
# 
# patch "tests/commit_use_workspace_keydir/__driver__.lua"
#  from [548f1d2719757e92b7617cc3d9ea695f25f60cd8]
#    to [01174c45d6045f48242c928f4f78c737b81af334]
# 
# patch "tests/creating_a_bad_criss-cross_merge/__driver__.lua"
#  from [1058b7dc4cefe4961109be8fd9a3458de9f2281b]
#    to [7c2d8fdceb3eb13b728dcab1d0d7f131c81fa6db]
# 
# patch "tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua"
#  from [a79a80a3cf746add495074f89359859e360e7711]
#    to [c497881095ce723398bf8339690168868c9e5562]
# 
# patch "tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua"
#  from [38877d2c12b7a16975cf6453becc26a8697e9709]
#    to [73b61a97856da8155f720d3b5af915c3d646f762]
# 
# patch "tests/netsync_negotiation/__driver__.lua"
#  from [dcad6342df86ae66ffd8fe6a1b34a11698129a9b]
#    to [9cdfd4875c4154afbaf00395e9ea1ec2322430bd]
# 
# patch "tests/non_workspace_keydir/__driver__.lua"
#  from [f419f410d4fd8154079354a42e7ca333230d415b]
#    to [bbf49f5bfb67b7fbef6f61cb4cc086c490185ad5]
# 
# patch "tests/short_options_work_correctly/__driver__.lua"
#  from [0614ec5afa8cab4ccd888c5ee08d1d0154b93d52]
#    to [1eec101aeaaf556d915db437f8962b4841fb88d0]
# 
# patch "tests/ssh_agent/__driver__.lua"
#  from [2d35382c6911efcb06b1b30b8093bbe134b3557b]
#    to [7a80c8d55bf69e347da5696c1b4dbb5a8fb1146b]
# 
# patch "tests/subdirectory_restrictions/__driver__.lua"
#  from [d40101e06f5b608f1252e979ef45bcecd7d9a2af]
#    to [9480c9aa71b166bdc1437844f1fac9ec25a5f7d0]
# 
# patch "tests/verification_of_command_line_options/__driver__.lua"
#  from [acb107efa511a9e99eda01333c5f2d3c5b712925]
#    to [5c4555cca70a26bab64704165581754446e4a1d1]
#
============================================================
--- contrib/monoprof.sh	a8c1041cfd7f06c57464bb2f07d893a2671ac702
+++ contrib/monoprof.sh	0c372d3806a279fe485946b206e63a970f4f745d
@@ -112,7 +112,7 @@ HOOKS=""
 [ -f ${MONOTONE} ] && VERSION=$(${MONOTONE} --version | sed 's/.*: \(.*\))/\1/')
 
 HOOKS=""
-[ -f ${DATADIR}/hooks.lua ] && HOOKS="--norc --rcfile=${DATADIR}/hooks.lua"
+[ -f ${DATADIR}/hooks.lua ] && HOOKS="--no-standard-rcfiles --rcfile=${DATADIR}/hooks.lua"
 
 server()
 {
============================================================
--- contrib/monotone-notify-hookversion.lua	8c80ab093597940f427baf1e3c08d1274f9b84c4
+++ contrib/monotone-notify-hookversion.lua	c21d57f58acc70452dc9ef46129d16455322b4b6
@@ -96,7 +96,7 @@ _MN_templates = {
       "#! /bin/sh",
       "",
       "LANG=C; export LANG",
-      "mtn address@hidden@ --norc pull @host@ \"@address@hidden""
+      "mtn address@hidden@ --no-standard-rcfiles pull @host@ \"@address@hidden""
    },
 
    do_revncert_init = {
============================================================
--- contrib/monotone.bash_completion	1ec88d4a5ecb6f5f4f87f823f1bd4c594f699695
+++ contrib/monotone.bash_completion	7f13ba6199009a21bbbcdb3385ee9ac8f3ff220f
@@ -135,8 +135,8 @@ _monotone() {
               --key -k
               --keydir
               --log
-              --norc
-              --nostd
+              --no-standard-rcfiles
+              --no-builtin-rcfiles
               --pid-file
               --quiet
               --rcfile
============================================================
--- contrib/monotone.zsh_completion	096ddfeacaa27baf509033c410e5ac0a57038a9f
+++ contrib/monotone.zsh_completion	52d512cf02c5383be3ac7cd765f26f25a623e33a
@@ -34,8 +34,8 @@ _mtn() {
     {'(--key)-k+','(-k)--key='}'[set key for signatures]:keys keys:_mtn_keys'\
     '--keydir=[set location of key store]:dir:_files -/'\
     '--log=[file to write the log to]:file:_files'\
-    '--norc[do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files]'\
-    '--nostd[do not load standard lua hooks]'\
+    '--no-standard-rcfiles[do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files]'\
+    '--no-builtin-rcfiles[do not load standard lua hooks]'\
     '--quiet[suppress log and progress messages]'\
     '--rcfile=[load extra rc file]:file:_files'\
     '--reallyquiet[suppress warning, verbose, informational and progress messages]'\
============================================================
--- lua-testsuite.lua	9c66b41808f9ac679e81d29f533917bb8fd01aae
+++ lua-testsuite.lua	705f0c0c86fc161772125c901d48e0b726c34670
@@ -17,7 +17,7 @@ function safe_mtn(...)
       err("'mtn' environment variable not set")
     end
   end
-  return {monotone_path, "--norc", "--root=" .. test.root,
+  return {monotone_path, "--no-standard-rcfiles", "--root=" .. test.root,
           "--confdir="..test.root, ...}
 end
 
@@ -31,7 +31,7 @@ function mtn_ws_opts(...)
       err("'mtn' environment variable not set")
     end
   end
-  return {monotone_path, "--ssh-sign=no", "--no-default-confdir", "--norc", "--rcfile", test.root .. "/test_hooks.lua", ...}
+  return {monotone_path, "--ssh-sign=no", "--no-default-confdir", "--no-standard-rcfiles", "--rcfile", test.root .. "/test_hooks.lua", ...}
 end
 
 function mtn_outside_ws(...)
@@ -46,7 +46,7 @@ function mtn_outside_ws(...)
   return {monotone_path,
          "--no-workspace",
          "--ssh-sign=no",
-         "--norc", "--rcfile", test.root .. "/test_hooks.lua",
+         "--no-standard-rcfiles", "--rcfile", test.root .. "/test_hooks.lua",
          "--confdir="..test.root,
          "--db=" .. test.root .. "/test.db",
          "--keydir", test.root .. "/keys",
@@ -67,20 +67,20 @@ function mtn(...)
 end
 
 function mtn(...)
-  return raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--nostd",
+  return raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--no-builtin-rcfiles",
          "--db=" .. test.root .. "/test.db",
          "--keydir", test.root .. "/keys",
          "address@hidden", ...)
 end
 
 function nodb_mtn(...)
-  return raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--nostd",
+  return raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--no-builtin-rcfiles",
          "--keydir", test.root .. "/keys",
          "address@hidden", ...)
 end
 
 function nokey_mtn(...)
-  return raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--nostd",
+  return raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--no-builtin-rcfiles",
          "--db=" .. test.root .. "/test.db",
          "--keydir", test.root .. "/keys", ...)
 end
============================================================
--- monotone.texi	c4402b63ac3d3061b85d5ca7788fe8fa31105adc
+++ monotone.texi	6e5779012e99eb8ca8ac5aae7ab017a92e4d8425
@@ -11830,7 +11830,7 @@ @section Additional Lua Functions
 
 @strong{Important notice:address@hidden
 To create a temporary file, you must use the @code{temp_file()}
-function, unless you need to run monotone with the @option{--nostd}
+function, unless you need to run monotone with the @option{--no-builtin-rcfiles}
 option.  @code{temp_file()} builds on @code{mkstemp()} and creates a
 file in the standard TMP/TEMP directories.
 For the definition of @code{temp_file()}, see @ref{Default hooks}.
@@ -11921,7 +11921,7 @@ @section Additional Lua Functions
 
 @strong{Important notice:address@hidden
 To spawn a process and wait for its completion, use the @code{execute()}
-function, unless you need to run monotone with the @option{--nostd}
+function, unless you need to run monotone with the @option{--no-builtin-rcfiles}
 option.  @code{execute()} builds on @code{spawn()} and @code{wait()}
 in a standardized way.
 
@@ -13351,7 +13351,7 @@ @appendix Default hooks
 
 This section contains the entire source code of the standard hook file,
 that is built in to the monotone executable, and read before any user
-hooks files (unless @option{--nostd} is passed).  It contains the
+hooks files (unless @option{--no-builtin-rcfiles} is passed).  It contains the
 default values for all hooks.
 
 @verbatiminclude std_hooks.lua
============================================================
--- options_list.hh	b99caffc94e84284a23e3c8d1c49f2ab1790d24b
+++ options_list.hh	e1c73654efd42c32cc74ec8014bbec1313d18fa0
@@ -459,18 +459,18 @@ SIMPLE_OPTION(no_merges, "no-merges/merg
 # define NORC_TEXT gettext_noop("do not load ~/.monotone/monotonerc or " \
                                 "_MTN/monotonerc lua files")
 #endif
-GROUPED_SIMPLE_OPTION(globals, norc, "norc/yesrc", bool, NORC_TEXT)
+GROUPED_SIMPLE_OPTION(globals, norc, "no-standard-rcfiles/standard-rcfiles", bool, NORC_TEXT)
 #undef NORC_TEXT
 
-GROUPED_SIMPLE_OPTION(globals, nostd, "nostd/stdhooks", bool,
-                     gettext_noop("do not load standard lua hooks"))
+GROUPED_SIMPLE_OPTION(globals, nostd, "no-builtin-rcfile/builtin-rcfile", bool,
+                     gettext_noop("do not load the built-in lua file with the default hooks"))
 
+GROUPED_SIMPLE_OPTION(globals, extra_rcfiles, "rcfile/clear-rcfiles", args_vector,
+                     gettext_noop("load extra lua file"))
+
 SIMPLE_OPTION(pidfile, "pid-file/no-pid-file", system_path,
               gettext_noop("record process id of server"))
 
-GROUPED_SIMPLE_OPTION(globals, extra_rcfiles, "rcfile/clear-rcfiles", args_vector,
-                     gettext_noop("load extra rc file"))
-
 OPTSET(verbosity)
 OPTSET_REL(globals, verbosity)
 OPTVAR(verbosity, int, verbosity, 0)
============================================================
--- tests/basic_invocation_and_options/__driver__.lua	6f4177e3596bfd9c7156653bec64e09185cd8b39
+++ tests/basic_invocation_and_options/__driver__.lua	8ba8077add865a20f8e7e2d85673899595ec845e
@@ -1,11 +1,11 @@ mtn_setup()
 mtn_setup()
 
-check(raw_mtn("--norc"), 2, false, true)
+check(raw_mtn("--no-standard-rcfiles"), 2, false, true)
 check(qgrep("Usage:", "stderr"))
 check(raw_mtn("--help"), 0, false)
 check(raw_mtn("--version"), 0, false)
-check(raw_mtn("--nostd", "--help"), 0, false)
-check(raw_mtn("--norc", "--help"), 0, false)
+check(raw_mtn("--no-builtin-rcfile", "--help"), 0, false)
+check(raw_mtn("--no-standard-rcfiles", "--help"), 0, false)
 check(raw_mtn("--debug", "--help"), 0, false, false)
 check(raw_mtn("--quiet", "--help"), 0, false)
 check(raw_mtn("--db=foo.db", "--help"), 0, false)
============================================================
--- tests/commit_use_workspace_keydir/__driver__.lua	548f1d2719757e92b7617cc3d9ea695f25f60cd8
+++ tests/commit_use_workspace_keydir/__driver__.lua	01174c45d6045f48242c928f4f78c737b81af334
@@ -14,7 +14,7 @@ function mtn_default_keydir(...)
     end
   end
   return {monotone_path, "--no-default-confdir",
-     "--norc", "--root=" .. test.root, "--db", "test.db",
+     "--no-standard-rcfiles", "--root=" .. test.root, "--db", "test.db",
   	  "--rcfile", test.root .. "/test_hooks.lua",
           "address@hidden", ...}
 end
============================================================
--- tests/creating_a_bad_criss-cross_merge/__driver__.lua	1058b7dc4cefe4961109be8fd9a3458de9f2281b
+++ tests/creating_a_bad_criss-cross_merge/__driver__.lua	7c2d8fdceb3eb13b728dcab1d0d7f131c81fa6db
@@ -31,12 +31,12 @@ function bob (...)
 
 function bob (...)
   return raw_mtn("--rcfile=test_hooks.lua", "--rcfile=bob.lua",
-                 "--nostd", "--norc", "--db=test.db", "--key=bob",
+                 "--no-builtin-rcfile", "--no-standard-rcfiles", "--db=test.db", "--key=bob",
                  "--keydir=keys", ...)
 end
 function alice (...)
   return raw_mtn("--rcfile=test_hooks.lua", "--rcfile=alice.lua",
-                 "--nostd", "--norc", "--db=test.db", "--key=alice",
+                 "--no-builtin-rcfile", "--no-standard-rcfiles", "--db=test.db", "--key=alice",
                  "--keydir=keys", ...)
 end
 
============================================================
--- tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua	a79a80a3cf746add495074f89359859e360e7711
+++ tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua	c497881095ce723398bf8339690168868c9e5562
@@ -26,7 +26,7 @@ check(indir(tmpdir,
 copy(test.root .. "/keys", tmpdir)
 
 check(indir(tmpdir,
-        { monotone_path, "--norc",
+        { monotone_path, "--no-standard-rcfiles",
            "--no-workspace",
            "--db="..tmpdir.."/test.db",
            "--confdir="..tmpdir,
@@ -35,7 +35,7 @@ check(indir(tmpdir,
       0, false, false)
 
 check(indir(tmpdir,
-        { monotone_path, "--norc", "--root="..tmpdir,
+        { monotone_path, "--no-standard-rcfiles", "--root="..tmpdir,
            "--no-workspace",
            "--db="..tmpdir.."/test.db",
            "--confdir="..tmpdir,
@@ -44,7 +44,7 @@ check(indir(tmpdir,
       0, false, false)
 
 check(indir(tmpdir,
-        { monotone_path, "--norc", "--root=.",
+        { monotone_path, "--no-standard-rcfiles", "--root=.",
            "--no-workspace",
            "--db="..tmpdir.."/test.db",
            "--confdir="..tmpdir,
@@ -53,7 +53,7 @@ check(indir(tmpdir,
       0, false, false)
 
 check(indir(tmpdir,
-        { monotone_path, "--norc",
+        { monotone_path, "--no-standard-rcfiles",
            "--no-workspace",
            "--db="..tmpdir.."/test.db",
            "--confdir="..tmpdir,
@@ -62,7 +62,7 @@ check(indir(tmpdir,
       0, false, false)
 
 check(indir(tmpdir,
-        { monotone_path, "--norc", "--root="..tmpdir,
+        { monotone_path, "--no-standard-rcfiles", "--root="..tmpdir,
            "--no-workspace",
            "--db="..tmpdir.."/test.db",
            "--confdir="..tmpdir,
@@ -71,7 +71,7 @@ check(indir(tmpdir,
       0, false, false)
 
 check(indir(tmpdir,
-        { monotone_path, "--norc", "--root=.",
+        { monotone_path, "--no-standard-rcfiles", "--root=.",
            "--no-workspace",
            "--db="..tmpdir.."/test.db",
            "--confdir="..tmpdir,
============================================================
--- tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua	38877d2c12b7a16975cf6453becc26a8697e9709
+++ tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua	73b61a97856da8155f720d3b5af915c3d646f762
@@ -20,7 +20,7 @@ check(indir(tmpdir,
 copy(test.root .. "/keys", tmpdir)
 
 check(indir(tmpdir,
-        { monotone_path, "--norc",
+        { monotone_path, "--no-standard-rcfiles",
            "--no-workspace",
            "--db="..tmpdir.."/test.db",
            "--confdir="..tmpdir,
@@ -29,7 +29,7 @@ check(indir(tmpdir,
       0, false, false)
 
 check(indir(tmpdir,
-        { monotone_path, "--norc", "--root="..tmpdir,
+        { monotone_path, "--no-standard-rcfiles", "--root="..tmpdir,
            "--no-workspace",
            "--db="..tmpdir.."/test.db",
            "--confdir="..tmpdir,
@@ -38,7 +38,7 @@ check(indir(tmpdir,
       0, false, false)
 
 check(indir(tmpdir,
-        { monotone_path, "--norc", "--root=.",
+        { monotone_path, "--no-standard-rcfiles", "--root=.",
            "--no-workspace",
            "--db="..tmpdir.."/test.db",
            "--confdir="..tmpdir,
============================================================
--- tests/netsync_negotiation/__driver__.lua	dcad6342df86ae66ffd8fe6a1b34a11698129a9b
+++ tests/netsync_negotiation/__driver__.lua	9cdfd4875c4154afbaf00395e9ea1ec2322430bd
@@ -16,7 +16,7 @@ function make_old(ver)
       rcfile = "test_hooks.lua"
    end
    local fn = function (...)
-                 return {exe, "--norc", "--root=.",
+                 return {exe, "--no-standard-rcfiles", "--root=.",
                     "--confdir=.",
                     "--rcfile="..rcfile,
                     "address@hidden",
============================================================
--- tests/non_workspace_keydir/__driver__.lua	f419f410d4fd8154079354a42e7ca333230d415b
+++ tests/non_workspace_keydir/__driver__.lua	bbf49f5bfb67b7fbef6f61cb4cc086c490185ad5
@@ -6,7 +6,7 @@ function pure_mtn(...)
       err("'mtn' environment variable not set")
     end
   end
-  return {monotone_path, "--ssh-sign=no", "--norc",
+  return {monotone_path, "--ssh-sign=no", "--no-standard-rcfiles",
 	  "--root=" .. test.root, "--db", "test.db",
 	  "--rcfile", test.root .. "/test_hooks.lua", ...}
 end
============================================================
--- tests/short_options_work_correctly/__driver__.lua	0614ec5afa8cab4ccd888c5ee08d1d0154b93d52
+++ tests/short_options_work_correctly/__driver__.lua	1eec101aeaaf556d915db437f8962b4841fb88d0
@@ -11,7 +11,7 @@ function short_mtn(...)
 -- same as mtn() but without --db and --key
 function short_mtn(...)
   return raw_mtn("--rcfile", test.root.."/test_hooks.lua",
-                 "--nostd", "--norc", "--root", test.root,
+                 "--no-builtin-rcfile", "--no-standard-rcfiles", "--root", test.root,
                  "--keydir", test.root.."/keys", ...)
 end
 
============================================================
--- tests/ssh_agent/__driver__.lua	2d35382c6911efcb06b1b30b8093bbe134b3557b
+++ tests/ssh_agent/__driver__.lua	7a80c8d55bf69e347da5696c1b4dbb5a8fb1146b
@@ -15,7 +15,7 @@ check(mtn("--key", "address@hidden", "ssh_agent
 check(mtn("--key", "address@hidden", "ssh_agent_export"), 1, false, false)
 
 -- * (ok) export key without -k
-check(raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--nostd",
+check(raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--no-builtin-rcfiles",
               "--db=" .. test.root .. "/test.db",
               "--keydir", test.root .. "/keys",
               "ssh_agent_export"), 0, false, false)
@@ -265,14 +265,14 @@ remove("_MTN/options")
 
 -- * (N)  try to export monotone key without -k
 remove("_MTN/options")
-check(raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--nostd",
+check(raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--no-builtin-rcfiles",
               "--db=" .. test.root .. "/test.db",
               "--keydir", test.root .. "/keys",
               "ssh_agent_export"), 1, false, false)
 
 -- * (N)  try to add monotone key without -k
 remove("_MTN/options")
-check(raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--nostd",
+check(raw_mtn("--rcfile", test.root .. "/test_hooks.lua", -- "--no-builtin-rcfiles",
               "--db=" .. test.root .. "/test.db",
               "--keydir", test.root .. "/keys",
               "ssh_agent_add"), 1, false, false)
============================================================
--- tests/subdirectory_restrictions/__driver__.lua	d40101e06f5b608f1252e979ef45bcecd7d9a2af
+++ tests/subdirectory_restrictions/__driver__.lua	9480c9aa71b166bdc1437844f1fac9ec25a5f7d0
@@ -29,29 +29,29 @@ chdir("foo")
 check(qgrep("bar/bar", "stdout"))
 
 chdir("foo")
-check(mtn("--norc", "status"), 0, true)
+check(mtn("--no-standard-rcfiles", "status"), 0, true)
 check(qgrep("foo/foo", "stdout"))
 check(qgrep("bar/bar", "stdout"))
 
-check(mtn("--norc", "status", "."), 0, true, false)
+check(mtn("--no-standard-rcfiles", "status", "."), 0, true, false)
 check(qgrep("foo/foo", "stdout"))
 check(not qgrep("bar/bar", "stdout"))
 
-check(mtn("--norc", "status", ".."), 0, true)
+check(mtn("--no-standard-rcfiles", "status", ".."), 0, true)
 check(qgrep("foo/foo", "stdout"))
 check(qgrep("bar/bar", "stdout"))
 chdir("..")
 
 chdir("bar")
-check(mtn("--norc", "status"), 0, true)
+check(mtn("--no-standard-rcfiles", "status"), 0, true)
 check(qgrep("foo/foo", "stdout"))
 check(qgrep("bar/bar", "stdout"))
 
-check(mtn("--norc", "status", "."), 0, true, false)
+check(mtn("--no-standard-rcfiles", "status", "."), 0, true, false)
 check(not qgrep("foo/foo", "stdout"))
 check(qgrep("bar/bar", "stdout"))
 
-check(mtn("--norc", "status", ".."), 0, true)
+check(mtn("--no-standard-rcfiles", "status", ".."), 0, true)
 check(qgrep("foo/foo", "stdout"))
 check(qgrep("bar/bar", "stdout"))
 chdir("..")
============================================================
--- tests/verification_of_command_line_options/__driver__.lua	acb107efa511a9e99eda01333c5f2d3c5b712925
+++ tests/verification_of_command_line_options/__driver__.lua	5c4555cca70a26bab64704165581754446e4a1d1
@@ -2,7 +2,7 @@ check(mtn(), 2, false, false)
 mtn_setup()
 
 check(mtn(), 2, false, false)
-check(mtn("--norc"), 2, false, false)
+check(mtn("--no-standard-rcfiles"), 2, false, false)
 check(mtn("--rcfile=test_hooks.lua"), 2, false, false)
 
 check(mtn("--unknown-option"), 1, false, false)