Fix for win32text corrupting files that have CRLF line endings. (
issue302)
Also generate a warning when encountering this condition.
From Shun-ichi Goto in attachment win32text-patch3.txt for issue 302.
Add --line-number option to hg annotate (
issue506)
Line numbers are separated from the last annotation element with a colon,
like with many other commands, e.g. (hg) grep or compiler errors.
Idea and tests by FUJIWARA Katsunori.
Check for conflict markers in hgmerge (
issue471)