view tests/test-conflict @ 9832:42ced358cbba

doc/style: use default font color specified by user

* it's bad to specify only foreground color:
  http://www.w3.org/QA/Tips/color
* some people prefer dark background
* `color: #111' is mostly the same as `color: black',
  which is the default of almost all popular browsers.

so it's preferable to delete `color: #111', rather than adding
`background-color: white'.

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
hg merge 1
hg id
cat a
hg status