.gitignore: git-merge-recur is a built file.

Also it is OK to omit the documentation for it at least for now.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/.gitignore b/.gitignore
index fb0fa3f16a7c8a42c5d0d1be62666cc4ea4c6575..2299e36ba9b61f081a96ce6b28f94974311d721c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ git-merge-tree
 git-merge-octopus
 git-merge-one-file
 git-merge-ours
+git-merge-recur
 git-merge-recursive
 git-merge-resolve
 git-merge-stupid

diff --git a/Makefile b/Makefile
index b7a095f0dd06791bf95194fbc27922abf1a91a1d..81d26a0881eb813f556ff4cd45084b3f4ebad565 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -802,7 +802,7 @@ check-docs::
        do \
                case "$$v" in \
                git-merge-octopus | git-merge-ours | git-merge-recursive | \
-               git-merge-resolve | git-merge-stupid | \
+               git-merge-resolve | git-merge-stupid | git-merge-recur | \
                git-ssh-pull | git-ssh-push ) continue ;; \
                esac ; \
                test -f "Documentation/$$v.txt" || \