Add a new merge strategy by Fredrik Kuivinen.

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f42b7e8..be9ea5f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@ git-mailinfo
 git-mailsplit
 git-merge
 git-merge-base
+git-merge-fredrik
 git-merge-index
 git-merge-octopus
 git-merge-one-file