merge with stable
authorMartin Geisler <mg@lazybytes.net>
Sat, 13 Nov 2010 15:57:40 +0100
changeset 12981 df7c2f81afd5
parent 12979 733345a127ca (current diff)
parent 12980 20974e51383a (diff)
child 12990 5f58e60f5777
merge with stable
hgext/eol.py
--- a/hgext/eol.py	Sat Nov 13 15:46:51 2010 +0100
+++ b/hgext/eol.py	Sat Nov 13 15:57:40 2010 +0100
@@ -66,6 +66,11 @@
 disable win32text and enable eol and your filters will still work. You
 only need to these filters until you have prepared a ``.hgeol`` file.
 
+The ``win32text.forbid*`` hooks provided by the win32text extension
+have been unified into a single hook named ``eol.hook``. The hook will
+lookup the expected line endings from the ``.hgeol`` file, which means
+you must migrate to a ``.hgeol`` file first before using the hook.
+
 See :hg:`help patterns` for more information about the glob patterns
 used.
 """