gitdiffcore(7): fix awkward wording

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4ff2fec2785d21055bdcb5d9661d5090624b92da..8054d9ddb8be3630f500be2ff37228aa17e839b1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -75,7 +75,6 @@ git-merge-one-file
 git-merge-ours
 git-merge-recursive
 git-merge-resolve
-git-merge-stupid
 git-merge-subtree
 git-mergetool
 git-mktag