options: kill -d for debug -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 options: kill -d for debug You must now use --debug. This is a preparatory step for changing the option parsing from: hg [global-opts] <command> [command-opts] to hg [global-opts] <command> [global or command opts] manifest hash: ec5ecc687340baa109a98b742f1cd8d1f4aadeed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx4urywK+sNU5EO8RAl90AJ0fwKU/GwHpJvlTFl5naeJbkceWewCgh4jK kaTSSodACgPzgbFiid5RL4Y= =siEe -----END PGP SIGNATURE-----

--- a/tests/test-flags.out
+++ b/tests/test-flags.out
@@ -62,13 +62,10 @@ user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     added a b
 
-+ hg -dv co -m
++ hg -v co -m
 resolving manifests
- ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e
- a versions differ, resolve
 merging a
 resolving a
-file a: other 37c42bd6cc03 ancestor b80de5d13875
 + ls -l ../test1/a ../test2/a
 + cut -b 0-10
 -rwxr-x---