Mercurial > hg

diff 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
line wrap: on
line diff
--- a/tests/test-conflict.out	Sat Jul 02 20:51:33 2005 -0800
+++ b/tests/test-conflict.out	Sat Jul 02 22:54:35 2005 -0800
@@ -9,15 +9,9 @@
 + hg commit -t branch2 -u test -d '0 0'
 + export HGMERGE=merge
 + HGMERGE=merge
-+ hg -d up -m 1
++ hg up -m 1
 merge: warning: conflicts during merge
-resolving manifests
- ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc
- a versions differ, resolve
-working dir created .out, keeping
 merging a
-resolving a
-file a: other d7250518cb1b ancestor 68ba9db7a9e4
 merging a failed!
 + hg id
 32e80765d7fe+75234512624c+ tip