Mercurial > hg > pyhgsh

diff tests/test-conflict @ 591:eb46971fc57f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7e4843b7efd2
line wrap: on
line diff
--- a/tests/test-conflict	Sat Jul 02 20:51:33 2005 -0800
+++ b/tests/test-conflict	Sat Jul 02 22:54:35 2005 -0800
@@ -11,7 +11,7 @@
 echo "something else" > a
 hg commit -t branch2 -u test -d "0 0"
 export HGMERGE=merge
-hg -d up -m 1
+hg up -m 1
 hg id
 grep -Ev ">>>|<<<" a
 hg status