From: David Aguilar <davvid@gmail.com>
Date: Tue, 7 Apr 2009 08:21:20 +0000 (-0700)
Subject: difftool: move 'git-difftool' out of contrib
X-Git-Tag: v1.6.3-rc1~13^2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/afcbc8e7ecb18a3ee542e808f02f5df7d56d5bdc?hp=afcbc8e7ecb18a3ee542e808f02f5df7d56d5bdc

difftool: move 'git-difftool' out of contrib

This prepares 'git-difftool' and its documentation for
mainstream use.

'git-difftool-helper' became 'git-difftool--helper'
since users should not use it directly.

'git-difftool' was added to the list of commands as
an ancillaryinterrogator.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---