[Emacs-diffs] master 56274bc: Add a Makefile rule for running gitmerge

[Glenn Morris]

branch: master
commit 56274bc0bbfe144ef4af08fc86e9455dabfccf30
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Add a Makefile rule for running gitmerge
    
    * Makefile.in (GITMERGE_EMACS, GITMERGE_NMIN): New variables.
    (gitmerge): New phony target.
---
 Makefile.in | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index 3f46d0a..75a501a 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