author | Thomas Arendsen Hein <thomas@intevation.de> |
Fri, 29 Jul 2005 14:54:36 +0100 | |
changeset 797 | 95c258ee5264 |
parent 749 | 7e4843b7efd2 |
child 801 | 1f9ec150a476 |
child 808 | 8f5637f0a0c0 |
child 814 | 0902ffece4b4 |
permissions | -rw-r--r-- |
+ hg init + echo nothing + hg add a + hg commit -m ancestor -d '0 0' + echo something + hg commit -m branch1 -d '0 0' + hg co 0 + echo 'something else' + hg commit -m branch2 -d '0 0' + export HGMERGE=merge + HGMERGE=merge + hg up -m 1 merge: warning: conflicts during merge merging a merging a failed! + hg id 32e80765d7fe+75234512624c+ tip + grep -Ev '>>>|<<<' a something else ======= something + hg status M a ? .out