Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 843:859e7ea530bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
'hg help -v' shows global options
author kreijack@inwind.REMOVEME.it
date Sat, 06 Aug 2005 13:27:31 +0100
parents 0902ffece4b4
children 5a034646e472
line wrap: on
line source

+ hg init
+ hg add a
+ hg commit -m ancestor -d 0 0
+ hg commit -m branch1 -d 0 0
+ hg co 0
+ hg commit -m branch2 -d 0 0
+ hg up -m 1
merge: warning: conflicts during merge
merging a
merging a failed!
+ hg id
32e80765d7fe+75234512624c+ tip
something else
=======
something
+ hg status
M a