view tests/test-conflict @ 7692:a55de9e2726f

i18n: updated Danish translation

This fixes a crash due to a bad string interpolation, fixes a bunch of
typos and adds more translated strings.

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