| commit | 99e20f105aa8a33ca9e70b741400a46447a287af | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Wed, 7 Dec 2016 20:41:05 +0000 (7 12:41 -0800) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Wed, 7 Dec 2016 20:41:05 +0000 (7 12:41 -0800) | ||
| tree | 54f401c83871ceddcacfdd48abb2dbd661d03d46 | treesnapshot (tar.gz zip) |
| parent | e22eabd5bcd6a840b4f4ff91e37a64c606c9751d | commitdiff |
| parent | ba2847f5a5c3a34274d564584ce6e1d1fbae6e85 | commitdiff |
Merge from origin/emacs-25
ba2847f ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. ...
8b43f97 * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046)
c20035c ; * doc/emacs/programs.texi (Man Page): Fix last change.
93d8346 Improve indexing of 'man'
ba2847f ; * lisp/vc/ediff-util.el (ediff-janitor): Fix last change. ...
8b43f97 * lisp/vc/ediff-util.el (ediff-janitor): Doc fix. (Bug#25046)
c20035c ; * doc/emacs/programs.texi (Man Page): Fix last change.
93d8346 Improve indexing of 'man'
| lisp/vc/ediff-util.el | diff1 | diff2 | blobhistory |