Documentation: pull/clone ref mapping clarification.

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 927c89cbacccf39f12979d02f6f9f473ac13e8e4..3edf6b41afe453130a3e7215991c6e2cd8dc57d7 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