##// END OF EJS Templates
updated help text and added manpage section for hg paths...
updated help text and added manpage section for hg paths Index: hg/doc/hg.1.txt ===================================================================

File last commit:

r814:0902ffec merge default
r924:ab681ea2 default
Show More
test-conflict.out
17 lines | 290 B | text/plain | TextLexer
/ tests / test-conflict.out
mpm@selenic.com
merge3: fix argument order...
r346 + hg init
+ hg add a
Thomas Arendsen Hein
Updated output of tests.
r801 + hg commit -m ancestor -d 0 0
+ hg commit -m branch1 -d 0 0
mpm@selenic.com
merge3: fix argument order...
r346 + hg co 0
Thomas Arendsen Hein
Updated output of tests.
r801 + hg commit -m branch2 -d 0 0
mpm@selenic.com
options: kill -d for debug...
r591 + hg up -m 1
mpm@selenic.com
merge3: fix argument order...
r346 merge: warning: conflicts during merge
merging a
merging a failed!
+ hg id
mpm@selenic.com
update tests to reflect new short hash length...
r374 32e80765d7fe+75234512624c+ tip
mpm@selenic.com
merge3: fix argument order...
r346 something else
=======
something
+ hg status
mpm@selenic.com
Update test output for status change...
r748 M a