i18n: mark help strings for translation
The gettext function is just another name for the normal _ function
and it is used for translating docstrings when using _ would make
pygettext.py output a warning.
#!/bin/sh
# a test for issue586
hg init a
cd a
echo a > a
hg ci -Ama
hg init ../b
cd ../b
echo b > b
hg ci -Amb
hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc
hg st -A