view tests/test-conflict @ 10711:2df044888693

keyword: do not customize ui.note() when overwriting

Behaviour change:
hg commit --verbose now prints out the names of the files
which are overwritten.

#!/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