Mercurial > hg
view tests/test-conflict.out @ 377:e5d769afd3ef
Merge with TAH
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge with TAH
manifest hash: f73215065ecbcfd9a0d0964de5ed73a392837a56
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsQqNywK+sNU5EO8RAiuOAJ4lL23LcxAkbPHy33snasBgrkhNxQCgkBLO
ohB0/EA2dAvQtu5sMSW03D8=
=lF8D
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 15 Jun 2005 21:13:49 -0800 |
parents | f07d00fcd281 f69a5d2d4fe1 |
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