]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/difftool.c
difftool: add a skeleton for the upcoming builtin
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 17 Jan 2017 15:54:57 +0000 (16:54 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 21:32:47 +0000 (13:32 -0800)
commitbe8a90e59ce4c7603207a8255284fdbbffff1a2e
treebe1a651a06850211075cde9c5d95f3f3fc684faf
parente2b2d6a172b76d44cb7b1ddb12ea5bfac9613a44
difftool: add a skeleton for the upcoming builtin

This adds a builtin difftool that still falls back to the legacy Perl
version, which has been renamed to `legacy-difftool`.

The idea is that the new, experimental, builtin difftool immediately hands
off to the legacy difftool for now, unless the config variable
difftool.useBuiltin is set to true.

This feature flag will be used in the upcoming Git for Windows v2.11.0
release, to allow early testers to opt-in to use the builtin difftool and
flesh out any bugs.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
.gitignore
Makefile
builtin.h
builtin/difftool.c [new file with mode: 0644]
git-legacy-difftool.perl [moved from git-difftool.perl with 100% similarity]
git.c
t/t7800-difftool.sh