author | mpm@selenic.com |
Thu, 21 Jul 2005 12:22:29 -0500 | |
changeset 743 | b0ba1866d6b5 |
parent 591 | eb46971fc57f |
child 748 | c5df1a9c5276 |
permissions | -rw-r--r-- |
+ 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 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 C a ? .out