git-merge: Exit with code 2 if no strategy was able to handle the merge.

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 16a8af6..8a6bd02 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -74,8 +74,8 @@ git-read-tree
 git-rebase
 git-receive-pack
 git-relink
-git-rename
 git-repack
+git-repo-config
 git-request-pull
 git-reset
 git-resolve