annotate tests/test-merge-default @ 9607:8e0e0d854b60

commands: do not split a translated string

Splitting the string after translation relies on the implicit
assumption that translators will always translate the English words
using single foreign words.

Also, when translating we want as much context as possible so I've
moved the string formatting into the translatable string.

#!/bin/sh

hg init
echo a > a
hg commit -A -ma

echo a >> a
hg commit -mb

echo a >> a
hg commit -mc

hg up 1
echo a >> a
hg commit -md

hg up 1
echo a >> a
hg commit -me

hg up 1
echo % should fail because not at a head
hg merge

hg up
echo % should fail because \> 2 heads
hg merge

echo % should succeed
hg merge 2
hg commit -mm1

echo % should succeed - 2 heads
hg merge -P
hg merge
hg commit -mm2

echo % should fail because at tip
hg merge

hg up 0
echo % should fail because 1 head
hg merge

true