diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-01-17 15:54:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 21:32:47 (GMT) |
| commit | be8a90e59ce4c7603207a8255284fdbbffff1a2e (patch) | |
| tree | be1a651a06850211075cde9c5d95f3f3fc684faf /t/t7800-difftool.sh | |
| parent | e2b2d6a172b76d44cb7b1ddb12ea5bfac9613a44 (diff) | |
| download | git-be8a90e59ce4c7603207a8255284fdbbffff1a2e.zip git-be8a90e59ce4c7603207a8255284fdbbffff1a2e.tar.gz git-be8a90e59ce4c7603207a8255284fdbbffff1a2e.tar.bz2 | |
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>
Diffstat (limited to 't/t7800-difftool.sh')
| -rwxr-xr-x | t/t7800-difftool.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 70a2de4..b6a6c30 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -23,6 +23,8 @@ prompt_given () test "$prompt" = "Launch 'test-tool' [Y/n]? branch" } +# NEEDSWORK: lose all the PERL prereqs once legacy-difftool is retired. + # Create a file on master and change it on branch test_expect_success PERL 'setup' ' echo master >file && |