Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 471:4c7f687e4313
Minor annotate performance tweaks
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Minor annotate performance tweaks
manifest hash: 2edd508182c7b3dfb2e0b9b90baebdd364cb29f0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvfQeywK+sNU5EO8RAsYSAJ0R8SuWnyQxVgauoaEuezOe3Taq/wCbBnEs
+VG0LNrXnQM9khQyc0+pCeg=
=U5gX
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sat, 25 Jun 2005 16:17:34 -0800 |
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