Merge branch 'js/c-merge-recursive'
[git/git.git] / .gitignore
index 55cd984..3da0e5e 100644 (file)
@@ -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