Mercurial > hg

diff tests/test-conflict.out @ 374:f07d00fcd281

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update tests to reflect new short hash length -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 update tests to reflect new short hash length manifest hash: 7ae99e74333416e8cbf8bc5d518bb5d3c449788b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsQo8ywK+sNU5EO8RAltAAJ97yqgcTU0eYrQ2vpIq+hrfCfrsVwCggUk4 adIvEe7OzGeG6wn0/aRoQXY= =h8+W -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 15 Jun 2005 21:12:28 -0800
parents f69a5d2d4fe1
children e5d769afd3ef
line wrap: on
line diff
--- a/tests/test-conflict.out	Wed Jun 15 21:11:40 2005 -0800
+++ b/tests/test-conflict.out	Wed Jun 15 21:12:28 2005 -0800
@@ -12,15 +12,15 @@
 + hg -d up -m 1
 merge: warning: conflicts during merge
 resolving manifests
- ancestor 1c6e5a12 local 35fedfab remote a5801785
+ ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc
  a versions differ, resolve
 working dir created .out, keeping
 merging a
 resolving a
-file a: other d7250518 ancestor 68ba9db7
+file a: other d7250518cb1b ancestor 68ba9db7a9e4
 merging a failed!
 + hg id
-32e80765+75234512+ tip
+32e80765d7fe+75234512624c+ tip
 + cat a
 + grep -v '>>>'
 + grep -v '<<<'