]> git.eshelyaron.com Git - emacs.git/commit
Fix encoding issues in gitmerge.el, make it work on MS-Windows
authorEli Zaretskii <eliz@gnu.org>
Wed, 3 Nov 2021 18:50:34 +0000 (20:50 +0200)
committerEli Zaretskii <eliz@gnu.org>
Wed, 3 Nov 2021 18:50:34 +0000 (20:50 +0200)
commit44c4139dfbab08307b4076ec2a4e85edb4b39cb8
treebbd371c82dda6314a3896d6b0901f309ae1dc93f
parentf78c819d9569ad18cc048554ddeb331a27a58989
Fix encoding issues in gitmerge.el, make it work on MS-Windows

* admin/gitmerge.el (gitmerge-emacs-version, gitmerge-show-log)
(gitmerge-show-diff, gitmerge-show-files, gitmerge-missing)
(gitmerge-setup-log-buffer, gitmerge-resolve)
(gitmerge-commit-message, gitmerge-apply)
(gitmerge-resolve-unmerged, gitmerge-repo-clean)
(gitmerge-commit): Bind coding-system-for-read/write to the
appropriate vc-git values.
(gitmerge-apply) [windows-nt]: Pass long merge log messages via a
temporary file.
(gitmerge): Clarify the description of the "R" flag.
admin/gitmerge.el