diff options
| author |  Sebastian Schuberth <sschuberth@gmail.com> | 2010-01-22 17:36:36 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-01-22 15:57:45 -0800 |
| commit | 4cacc621f80bbd878a320a664dff1440a9358785 (patch) | |
| tree | 3f95cc805298acb5d53de2731a7a75beb0efa13c /builtin-apply.c | |
| parent | engine.pl: Fix a recent breakage of the buildsystem generator (diff) | |
| download | tgif-4cacc621f80bbd878a320a664dff1440a9358785.tar.xz | |
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>
Diffstat (limited to 'builtin-apply.c')
0 files changed, 0 insertions, 0 deletions