Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 733:1966c553f652
Convert annotate over to walk interface.
Add emptyok parameter to walk and matchpats, for commands that require
at least one name.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 20 Jul 2005 03:23:12 -0800 |
parents | eb46971fc57f |
children | c5df1a9c5276 |
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 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