Mercurial > hg > pyhgsh

comparison 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
comparison
equal deleted inserted replaced
590:38d106db75bc 591:eb46971fc57f
9 hg commit -t branch1 -u test -d "0 0" 9 hg commit -t branch1 -u test -d "0 0"
10 hg co 0 10 hg co 0
11 echo "something else" > a 11 echo "something else" > a
12 hg commit -t branch2 -u test -d "0 0" 12 hg commit -t branch2 -u test -d "0 0"
13 export HGMERGE=merge 13 export HGMERGE=merge
14 hg -d up -m 1 14 hg up -m 1
15 hg id 15 hg id
16 grep -Ev ">>>|<<<" a 16 grep -Ev ">>>|<<<" a
17 hg status 17 hg status