projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e22eabd ba2847f)
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:41:05 +0000 (12:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:41:05 +0000 (12:41 -0800)
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'

1  2 
lisp/vc/ediff-util.el patch | diff1 | diff2 | blob | history

diff --cc lisp/vc/ediff-util.el
Simple merge
Unnamed repository; edit this file 'description' to name the repository.