Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 475:ab53998b9dcd
Fixed diff generation in hgeditor if a list of files is given to hg commit.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fixed diff generation in hgeditor if a list of files is given to hg commit.
manifest hash: 3eadc3637963778a35000fa75f229eb6b44ffc3d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCvoRsW7P1GVgWeRoRArNpAJ4p5NQBkv1X+eHwWU7+aqoGkcqwlACgklk2
e/vr9qiIPcOVrbYViapZD9E=
=3fRb
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 26 Jun 2005 11:33:16 +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