]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 066b65d) | patch
Add a Makefile rule for running gitmerge
authorGlenn Morris <rgm@gnu.org>
Tue, 19 Dec 2017 01:08:31 +0000 (20:08 -0500)
committerGlenn Morris <rgm@gnu.org>
Tue, 19 Dec 2017 01:08:31 +0000 (20:08 -0500)
commit56274bc0bbfe144ef4af08fc86e9455dabfccf30
tree58219e0912e7c938dd9e7bd69e804a716e5f21aftree | snapshot
parent066b65d03d4e6a1f666917fcea78998f3d001873commit | diff
Add a Makefile rule for running gitmerge

* Makefile.in (GITMERGE_EMACS, GITMERGE_NMIN): New variables.
(gitmerge): New phony target.
Makefile.in diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.