diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2021-11-03 20:50:34 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2021-11-03 20:50:34 +0200 |
| commit | 44c4139dfbab08307b4076ec2a4e85edb4b39cb8 (patch) | |
| tree | bbd371c82dda6314a3896d6b0901f309ae1dc93f /lisp/emacs-lisp | |
| parent | f78c819d9569ad18cc048554ddeb331a27a58989 (diff) | |
| download | emacs-44c4139dfbab08307b4076ec2a4e85edb4b39cb8.tar.gz emacs-44c4139dfbab08307b4076ec2a4e85edb4b39cb8.tar.bz2 emacs-44c4139dfbab08307b4076ec2a4e85edb4b39cb8.zip | |
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.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions