Merge branch 'master' of git://repo.or.cz/git/mergetool

diff --git a/.gitignore b/.gitignore
index f15155d1b7bcb45db6a8d67eab51b535102353c1..27797d1491938a9ca6b1f6dbd52d20e3388b0bed 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ git-archive
 git-bisect
 git-blame
 git-branch
+git-bundle
 git-cat-file
 git-check-ref-format
 git-checkout
@@ -74,6 +75,7 @@ git-merge-ours
 git-merge-recursive
 git-merge-resolve
 git-merge-stupid
+git-mergetool
 git-mktag
 git-mktree
 git-name-rev
@@ -139,6 +141,7 @@ git-whatchanged
 git-write-tree
 git-core-*/?*
 gitweb/gitweb.cgi
+test-chmtime
 test-date
 test-delta
 test-dump-cache-tree