blame.c: move code to output metainfo into a separate function.

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 284db5dffc6605a44b08b21a677434758c63cbe5..25eb4637a6f971a4a290ab823a937997c700bd7f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -65,6 +65,7 @@ git-merge-one-file
 git-merge-ours
 git-merge-recur
 git-merge-recursive
+git-merge-recursive-old
 git-merge-resolve
 git-merge-stupid
 git-mktag