Mercurial > hg
view tests/test-conflict.out @ 387:c07c6fb2f0a8
Show tags in hg history etc.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Show tags in hg history etc.
manifest hash: 5520d8f5be86d5183c5b6f84e25cb99eb35ad4b7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCsphGW7P1GVgWeRoRAtujAJ97McEv8gL8m1uZz79ufKgbzFf6ZACfd7vQ
49wFPb65oMSwro9XjOoGgCk=
=BSsw
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 17 Jun 2005 10:30:46 +0100 |
parents | e5d769afd3ef |
children | ee4c80d294e5 |
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 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 + cat a + grep -v '>>>' + grep -v '<<<' something else ======= something + hg status C a ? .out