view tests/test-conflict @ 7687:1ac4dc64cf2a

i18n: sort by file when generating hg.pot
This will make the order more stable and give smaller patches when
translations merge in new and deleted strings from the hg.pot file.

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