Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 352:ca39b80cbe15
ignore files associated with quilt
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
ignore files associated with quilt
manifest hash: f0da2c0465fb27005d5bde30e0171ae9a76951d0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsGpIywK+sNU5EO8RAi+uAJ4/cXWFBnXoLHH8bN8Xbe/nzXHycgCfQkO2
WdEoWI4YpiNQ+s5id6Xxphw=
=6cXJ
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 15 Jun 2005 09:50:00 -0800 |
parents | f69a5d2d4fe1 |
children | f07d00fcd281 e5d769afd3ef |
line wrap: on
line source
+ hg init + echo nothing + hg add a + hg commit -t ancestor -u test -d '0 0' + echo something + hg commit -t branch1 -u test -d '0 0' + hg co 0 + echo 'something else' + hg commit -t branch2 -u test -d '0 0' + export HGMERGE=merge + HGMERGE=merge + hg -d up -m 1 merge: warning: conflicts during merge resolving manifests ancestor 1c6e5a12 local 35fedfab remote a5801785 a versions differ, resolve working dir created .out, keeping merging a resolving a file a: other d7250518 ancestor 68ba9db7 merging a failed! + hg id 32e80765+75234512+ tip + cat a + grep -v '>>>' + grep -v '<<<' something else ======= something + hg status C a ? .out