projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 74cf9bd) | patch
Make difftool.prompt fall back to mergetool.prompt
authorSebastian Schuberth <sschuberth@gmail.com>
Fri, 22 Jan 2010 16:36:36 +0000 (17:36 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Jan 2010 23:57:45 +0000 (15:57 -0800)
commit4cacc621f80bbd878a320a664dff1440a9358785
tree3f95cc805298acb5d53de2731a7a75beb0efa13ctree | snapshot
parent74cf9bdda693e4c7b9443dea6a30d52f55f16517commit | diff
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>
git-difftool--helper.sh diff | blob | history
Git—the stupid content tracker