difftool: move 'git-difftool' out of contrib
commitd3b8cec780279a2808295ca7e6a8abcf68b4a05e
authorDavid Aguilar <davvid@gmail.com>
Thu, 19 Mar 2009 08:25:25 +0000 (19 01:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Mar 2009 09:55:41 +0000 (19 02:55 -0700)
tree83d7e8ea62c714b1d6cc54138a49b8bb8a4bdab6
parente986ceb05a118944d2638fba4cd09678c1afa6b3
difftool: move 'git-difftool' out of contrib

This prepares 'git-difftool' and its documentation for
mainstream use.  The backup file feature was removed since
most users found it annoying.  The reasoning is that it's
better to start out with less features from the get-go and
only add things as users ask for them.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
.gitignore
Documentation/config.txt
Documentation/git-difftool.txt [moved from contrib/difftool/git-difftool.txt with 73% similarity]
Makefile
git-difftool-helper.sh [moved from contrib/difftool/git-difftool-helper with 86% similarity]
git-difftool.perl [moved from contrib/difftool/git-difftool with 100% similarity]