From: Glenn Morris <rgm@gnu.org>
Date: Tue, 19 Dec 2017 01:08:31 +0000 (-0500)
Subject: Add a Makefile rule for running gitmerge
X-Git-Tag: emacs-27.0.90~6004
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=56274bc0bbfe144ef4af08fc86e9455dabfccf30;p=emacs.git

Add a Makefile rule for running gitmerge

* Makefile.in (GITMERGE_EMACS, GITMERGE_NMIN): New variables.
(gitmerge): New phony target.
---

diff --git a/Makefile.in b/Makefile.in
index 3f46d0acafa..75a501a6608 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1155,3 +1155,13 @@ check-declare:
 	  exit 1; \
 	fi
 	$(MAKE) -C lisp $@
+
+.PHONY: gitmerge
+
+GITMERGE_EMACS = ./src/emacs${EXEEXT}
+GITMERGE_NMIN = 10
+
+gitmerge:
+	${GITMERGE_EMACS} -batch --no-site-file --no-site-lisp \
+	  -l ${srcdir}/admin/gitmerge.el \
+	  --eval '(setq gitmerge-minimum-missing ${GITMERGE_NMIN})' -f gitmerge