.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>
Junio C Hamano committed
Aug 3, 2006 at 16:17 UTC
c8b87ef8b0da6b08a19ed4f98eb58f46748af1e9
2 files changed
+2
-1
.gitignore
+1
@@ -62,6 +62,7 @@ git-merge-tree
62
git-merge-octopus
63
git-merge-one-file
64
git-merge-ours
65
+git-merge-recur
66
git-merge-recursive
67
git-merge-resolve
68
git-merge-stupid
Makefile
+1
-1
@@ -802,7 +802,7 @@ check-docs::
802
do \
803
case "$$v" in \
804
git-merge-octopus | git-merge-ours | git-merge-recursive | \
805
- git-merge-resolve | git-merge-stupid | \
805
+ git-merge-resolve | git-merge-stupid | git-merge-recur | \
806
git-ssh-pull | git-ssh-push ) continue ;; \
807
esac ; \
808
test -f "Documentation/$$v.txt" || \