diff options
Diffstat (limited to 'man/ediff.texi')
| -rw-r--r-- | man/ediff.texi | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/man/ediff.texi b/man/ediff.texi index 384e3e8ee1c..ce8ed1d14d0 100644 --- a/man/ediff.texi +++ b/man/ediff.texi @@ -1725,6 +1725,17 @@ such as @samp{-w} that ignore certain kinds of changes. However, Ediff does not let you use the option @samp{-c}, as it doesn't recognize this format yet. +@item ediff-coding-system-for-read +@itemx ediff-coding-system-for-read +@vindex ediff-coding-system-for-read +This variable specifies the coding system to use when reading the output +that the programs @code{diff3} and @code{diff} send to Emacs. The default +is @code{raw-text}, and this should work fine in Unix and in most +cases under Windows NT/95/98/2000. There are @code{diff} programs +for which the default option doesn't work under Windows. In such cases, +@code{raw-text-dos} might work. If not, you will have to experiment with +other coding systems or use GNU diff. + @item ediff-patch-program The program to use to apply patches. Since there are certain incompatibilities between the different versions of the patch program, the |