Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 541:abaea35387a8
Added support for hg:// and old-http:// to 'hg clone'.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Added support for hg:// and old-http:// to 'hg clone'.
manifest hash: 4292cc7927afbec5663b5fff4317a238fb65cdec
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCw44lW7P1GVgWeRoRArWzAJ9AjiCF7poldqFxshV+lAyHZKy2PACgpCt1
KTdmdp+AL6m953NnYc5QNbo=
=BWbr
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 30 Jun 2005 07:16:05 +0100 |
parents | ee4c80d294e5 |
children | eb46971fc57f |
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 + grep -Ev '>>>|<<<' a something else ======= something + hg status C a ? .out