Fix failures in smerge-mode on MS-Windows
* lisp/vc/smerge-mode.el (smerge--refine-chopup-region): Use utf-8-emacs-unix, not emacs-internal, to make the forced EOL convention explicit. (smerge-refine-regions): Use utf-8-emacs instead of emacs-internal, to allow decoding of non-Unix EOL conventions. (Bug#29916)
Showing
Please register or sign in to comment