tests/test-conflict.out
author Jeff Sipek <jeffpc@optonline.net>
Mon, 08 Aug 2005 19:49:48 -0800
changeset 858 c333dfa8fa1a
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
[PATCH] Move default page name into map file Move default page name from code into the map file. This way, different hgweb styles/themes are free to select their default (no cmd in args) page.

+ 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