Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 757:7000825ef3ba
Updated help strings and test-help:
- options -I/-X: always at the end, don't include them in the synopsis.
- NAME is optional for hg revert
- other small changes.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 22 Jul 2005 08:47:35 +0100 |
parents | 7e4843b7efd2 |
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