comparison tests/test-merge1.out @ 591:eb46971fc57f

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-----
author mpm@selenic.com
date Sat, 02 Jul 2005 22:54:35 -0800
parents 5b22029b5aa2
children 7e4843b7efd2
comparison
equal deleted inserted replaced
590:38d106db75bc 591:eb46971fc57f