# 
# patch "ChangeLog"
#  from [9192e933cca2c7bc5a28a69c2f65b18029c98171]
#    to [edf9a73be870b9a7fa9a2749127fe45a63927a00]
# 
# patch "tests/t_cmdline_options.at"
#  from [9648ce834ac31c4e8fa2598435448836df2f0b36]
#    to [a63163efe23eddeed9d7ae79efed99df0cdf07fa]
# 
========================================================================
--- ChangeLog	9192e933cca2c7bc5a28a69c2f65b18029c98171
+++ ChangeLog	edf9a73be870b9a7fa9a2749127fe45a63927a00
@@ -1,9 +1,9 @@
 2005-10-12  Matt Johnston  <address@hidden>
 
 	* monotone.cc: return with exit code of 2 on usage output
 	* testsuite.at: turn "cat_foo" into "automate get_foo"
 	* tests/t_empty_env.at, tests/t_null.at, tests/t_at_sign.at,
-	tests/t_unreadable_db.at: expect 2 exit code
+	tests/t_unreadable_db.at, tests/t_cmdline_options.at: expect 2 exit code
 	* tests/t_cross.at: update to the changeset paradigm of immutable
 	ancestors.
 
========================================================================
--- tests/t_cmdline_options.at	9648ce834ac31c4e8fa2598435448836df2f0b36
+++ tests/t_cmdline_options.at	a63163efe23eddeed9d7ae79efed99df0cdf07fa
@@ -1,10 +1,10 @@
 AT_SETUP([verification of command line options])
 
 MONOTONE_SETUP
 
-AT_CHECK(MONOTONE, [0], [ignore], [ignore])
-AT_CHECK(MONOTONE --norc, [0], [ignore], [ignore])
-AT_CHECK(MONOTONE --rcfile=test_hooks.lua, [0], [ignore], [ignore])
+AT_CHECK(MONOTONE, [2], [ignore], [ignore])
+AT_CHECK(MONOTONE --norc, [2], [ignore], [ignore])
+AT_CHECK(MONOTONE --rcfile=test_hooks.lua, [2], [ignore], [ignore])
 
 AT_CHECK(MONOTONE --unknown-option, [1], [ignore], [ignore])
 AT_CHECK(MONOTONE --rcfile, [1], [ignore], [ignore])