--- a/mercurial/help/environment.txt Tue Oct 26 12:18:39 2010 +0200
+++ b/mercurial/help/environment.txt Wed Oct 27 15:35:21 2010 -0500
@@ -24,6 +24,13 @@
"ignore", which drops them. This setting can be overridden with
the --encodingmode command-line option.
+HGENCODINGAMBIGUOUS
+ This sets Mercurial's behavior for handling characters with
+ "ambiguous" widths like accented Latin characters with East Asian
+ fonts. By default, Mercurial assumes ambiguous characters are
+ narrow, set this variable to "wide" if such characters cause
+ formatting problems.
+
HGMERGE
An executable to use for resolving merge conflicts. The program
will be executed with three arguments: local file, remote file,