tests/test-conflict.out
author TK Soh <teekaysoh@yahoo.com>
Tue, 16 Aug 2005 17:30:41 -0800
changeset 924 ab681ea2857e
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
updated help text and added manpage section for hg paths Index: hg/doc/hg.1.txt ===================================================================

+ 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