Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change.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 | 4fc63e22b1fe |
children | d96c1153b25d |
line wrap: on
line diff
--- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -25,7 +25,7 @@ diff -r c19d34741b0a a + hg -q pull ../r1 + hg status C a -+ hg -d up ++ hg --debug up resolving manifests ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e a versions differ, resolve @@ -34,7 +34,7 @@ getting b merging a resolving a file a: other d730145abbf9 ancestor b789fdd96dc2 -+ hg -d up -m ++ hg --debug up -m resolving manifests ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e + hg parents