--- a/contrib/win32/mercurial.ini	Wed Jun 02 14:40:31 2010 +0200
+++ b/contrib/win32/mercurial.ini	Wed Jun 02 14:54:25 2010 +0200
@@ -43,6 +43,7 @@
 ;churn =
 ;color =
 ;convert =
+;eol =
 ;extdiff =
 ;fetch =
 ;gpg =
@@ -63,39 +64,8 @@
 ;record =
 ;transplant =
 ;win32mbcs =
-;win32text =
 ;zeroconf =
 
-; To use cleverencode/cleverdecode, you must enable win32text extension
-
-[encode]
-; Encode files that don't contain NUL characters.
-
-; ** = cleverencode:
-
-; Alternatively, you can explicitly specify each file extension that
-; you want encoded (any you omit will be left untouched), like this:
-
-; *.txt = dumbencode:
-
-
-[decode]
-; Decode files that don't contain NUL characters.
-
-; ** = cleverdecode:
-
-; Alternatively, you can explicitly specify each file extension that
-; you want decoded (any you omit will be left untouched), like this:
-
-; **.txt = dumbdecode:
-
-[patch]
-; If you enable win32text filtering, you will want to enable this
-; line as well to allow patching to work correctly.
-
-; eol = crlf
-
-
 ;
 ; Define external diff commands
 ;