X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.gitignore;h=3edf6b41afe453130a3e7215991c6e2cd8dc57d7;hb=64da9e604eea25c9c20cfe12618285ccd0bf3cfe;hp=927c89cbacccf39f12979d02f6f9f473ac13e8e4;hpb=123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8;p=git.git

diff --git a/.gitignore b/.gitignore
index 927c89cb..3edf6b41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@ git-merge-base
 git-merge-index
 git-merge-octopus
 git-merge-one-file
+git-merge-ours
 git-merge-recursive
 git-merge-resolve
 git-merge-stupid