Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 899:aa5b726e9619

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add '-' support to the commit logfile option to read message from stdin.
author mark.williamson@cl.cam.ac.uk
date Sun, 14 Aug 2005 12:30:01 -0800
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