Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-flags.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 | e94cebc60d96 |
children | d96c1153b25d |
comparison
equal
deleted
inserted
replaced
590:38d106db75bc | 591:eb46971fc57f |
---|---|
60 changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 | 60 changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
61 user: test | 61 user: test |
62 date: Thu Jan 1 00:00:00 1970 | 62 date: Thu Jan 1 00:00:00 1970 |
63 summary: added a b | 63 summary: added a b |
64 | 64 |
65 + hg -dv co -m | 65 + hg -v co -m |
66 resolving manifests | 66 resolving manifests |
67 ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e | |
68 a versions differ, resolve | |
69 merging a | 67 merging a |
70 resolving a | 68 resolving a |
71 file a: other 37c42bd6cc03 ancestor b80de5d13875 | |
72 + ls -l ../test1/a ../test2/a | 69 + ls -l ../test1/a ../test2/a |
73 + cut -b 0-10 | 70 + cut -b 0-10 |
74 -rwxr-x--- | 71 -rwxr-x--- |
75 -rwxr-x--- | 72 -rwxr-x--- |