Merge branch 'jc/diff' into next

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a536f32497b75f95b7943c9c639bdf4df0777145..145f8555ad4b5c13cb7a6076cf7d9e809beff952 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -111,7 +111,6 @@ git-tag
 git-tar-tree
 git-unpack-file
 git-unpack-objects
-git-unresolve
 git-update-index
 git-update-ref
 git-update-server-info