annotate tests/test-conflict @ 9734:36c388a1aa51

commands: call ui.username carefully in debuginstall

After c63c336ee2f7, 'hg debuginstall' would abort halfway through if
no username was set. We now catch and display the exception instead.

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