tests/test-conflict.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 06 Aug 2005 15:43:12 +0100
changeset 849 8933ef744325
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
Further help improvements: Show command aliases in 'hg help something', unless in quiet mode. Show short command description with 'hg help -q something'. Show global options in verbose mode of command help. State that Mercurial is a Distributed SCM.

+ 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