diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-12-18 20:08:31 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-12-18 20:08:31 -0500 |
| commit | 56274bc0bbfe144ef4af08fc86e9455dabfccf30 (patch) | |
| tree | 58219e0912e7c938dd9e7bd69e804a716e5f21af /lisp/emacs-lisp/subr-x.el | |
| parent | 066b65d03d4e6a1f666917fcea78998f3d001873 (diff) | |
| download | emacs-56274bc0bbfe144ef4af08fc86e9455dabfccf30.tar.gz emacs-56274bc0bbfe144ef4af08fc86e9455dabfccf30.tar.bz2 emacs-56274bc0bbfe144ef4af08fc86e9455dabfccf30.zip | |
Add a Makefile rule for running gitmerge
* Makefile.in (GITMERGE_EMACS, GITMERGE_NMIN): New variables.
(gitmerge): New phony target.
Diffstat (limited to 'lisp/emacs-lisp/subr-x.el')
0 files changed, 0 insertions, 0 deletions