Sebastian Schuberth 4cacc621f8 Make difftool.prompt fall back to mergetool.prompt ...

The documentation states that "git-difftool falls back to git-mergetool
config variables when the difftool equivalents have not been defined".
Until now, this was not the case for "difftool.prompt".

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

2010-01-22 15:57:45 -08:00

1.7 KiB

Executable File

Raw Blame History

View Raw