aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.in10
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index 3f46d0acafa..75a501a6608 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1155,3 +1155,13 @@ check-declare:
1155 exit 1; \ 1155 exit 1; \
1156 fi 1156 fi
1157 $(MAKE) -C lisp $@ 1157 $(MAKE) -C lisp $@
1158
1159.PHONY: gitmerge
1160
1161GITMERGE_EMACS = ./src/emacs${EXEEXT}
1162GITMERGE_NMIN = 10
1163
1164gitmerge:
1165 ${GITMERGE_EMACS} -batch --no-site-file --no-site-lisp \
1166 -l ${srcdir}/admin/gitmerge.el \
1167 --eval '(setq gitmerge-minimum-missing ${GITMERGE_NMIN})' -f gitmerge