view tests/test-586 @ 7117:ceb8aef03aa7

Document email.charsets in hgrc.5

hgrc.5.ja.txt probably should include an example like:

[email]
charsets = iso-8859-1, iso-8859-15, windows-1252, iso-8859-2,
           windows-1250, iso-2022-jp, iso-2022-jp-ms

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