X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=.gitignore;h=be9ea5fa9c1a2476744c5d9a0b1f4c919f4f485d;hb=7fa090844f7d1624c7d1ffc621aae6aec84a1110;hp=f42b7e8f7abf53fde38862152a504f6d6c108af0;hpb=44ec46a9dff34d0d0d207741094b3a8ebd0e5324;p=git.git

diff --git a/.gitignore b/.gitignore
index f42b7e8f..be9ea5fa 100644
--- 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