Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 749:7e4843b7efd2
Update tests to use commit -m and default -u
manifest hash: 6e4385453843031a712005a320d6000595b40d05
author | mpm@selenic.com |
---|---|
date | Thu, 21 Jul 2005 15:05:17 -0500 |
parents | c5df1a9c5276 |
children | 1f9ec150a476 8f5637f0a0c0 0902ffece4b4 |
line wrap: on
line source
+ 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