Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
373:67081329d49a 374:f07d00fcd281
10 + export HGMERGE=merge 10 + export HGMERGE=merge
11 + HGMERGE=merge 11 + HGMERGE=merge
12 + hg -d up -m 1 12 + hg -d up -m 1
13 merge: warning: conflicts during merge 13 merge: warning: conflicts during merge
14 resolving manifests 14 resolving manifests
15 ancestor 1c6e5a12 local 35fedfab remote a5801785 15 ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc
16 a versions differ, resolve 16 a versions differ, resolve
17 working dir created .out, keeping 17 working dir created .out, keeping
18 merging a 18 merging a
19 resolving a 19 resolving a
20 file a: other d7250518 ancestor 68ba9db7 20 file a: other d7250518cb1b ancestor 68ba9db7a9e4
21 merging a failed! 21 merging a failed!
22 + hg id 22 + hg id
23 32e80765+75234512+ tip 23 32e80765d7fe+75234512624c+ tip
24 + cat a 24 + cat a
25 + grep -v '>>>' 25 + grep -v '>>>'
26 + grep -v '<<<' 26 + grep -v '<<<'
27 something else 27 something else
28 ======= 28 =======