Add 'ours' merge strategy.

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 927c89c..3edf6b4 100644 (file)
--- 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