Mercurial > hg > pyhgsh

comparison tests/test-conflict.out @ 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 ee4c80d294e5
children c5df1a9c5276
comparison
equal deleted inserted replaced
590:38d106db75bc 591:eb46971fc57f
7 + hg co 0 7 + hg co 0
8 + echo 'something else' 8 + echo 'something else'
9 + hg commit -t branch2 -u test -d '0 0' 9 + hg commit -t branch2 -u test -d '0 0'
10 + export HGMERGE=merge 10 + export HGMERGE=merge
11 + HGMERGE=merge 11 + HGMERGE=merge
12 + hg -d up -m 1 12 + hg up -m 1
13 merge: warning: conflicts during merge 13 merge: warning: conflicts during merge
14 resolving manifests
15 ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc
16 a versions differ, resolve
17 working dir created .out, keeping
18 merging a 14 merging a
19 resolving a
20 file a: other d7250518cb1b ancestor 68ba9db7a9e4
21 merging a failed! 15 merging a failed!
22 + hg id 16 + hg id
23 32e80765d7fe+75234512624c+ tip 17 32e80765d7fe+75234512624c+ tip
24 + grep -Ev '>>>|<<<' a 18 + grep -Ev '>>>|<<<' a
25 something else 19 something else