diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-27 16:04:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-27 16:04:32 -0800 |
| commit | 66b1160141fc9c5ea01c473aaef4e6a5c8532ec5 (patch) | |
| tree | 52a24e95c9db279df2b57b5b5ab7e4ec68a7c79c /mergetools/vimdiff | |
| parent | 03f9f1a3a24053e90de15b432b02d746fc25bb6a (diff) | |
| parent | b21d164275b9186421ebe39498be47ea9f171694 (diff) | |
| download | git-66b1160141fc9c5ea01c473aaef4e6a5c8532ec5.tar.xz | |
Merge branch 'km/mergetool-vimdiff-layout-fallback'
Variants of vimdiff learned to honor mergetool.<variant>.layout settings.
* km/mergetool-vimdiff-layout-fallback:
mergetools: vimdiff: use correct tool's name when reading mergetool config
Diffstat (limited to 'mergetools/vimdiff')
| -rw-r--r-- | mergetools/vimdiff | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mergetools/vimdiff b/mergetools/vimdiff index 06937acbf5..97e376329b 100644 --- a/mergetools/vimdiff +++ b/mergetools/vimdiff @@ -371,9 +371,17 @@ diff_cmd_help () { merge_cmd () { - layout=$(git config mergetool.vimdiff.layout) + TOOL=$1 - case "$1" in + layout=$(git config "mergetool.$TOOL.layout") + + # backward compatibility: + if test -z "$layout" + then + layout=$(git config mergetool.vimdiff.layout) + fi + + case "$TOOL" in *vimdiff) if test -z "$layout" then |