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 /Documentation/mergetools | |
| 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 'Documentation/mergetools')
| -rw-r--r-- | Documentation/mergetools/vimdiff.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/mergetools/vimdiff.txt b/Documentation/mergetools/vimdiff.txt index d1a4c468e6..befa86d692 100644 --- a/Documentation/mergetools/vimdiff.txt +++ b/Documentation/mergetools/vimdiff.txt @@ -177,7 +177,8 @@ Instead of `--tool=vimdiff`, you can also use one of these other variants: When using these variants, in order to specify a custom layout you will have to set configuration variables `mergetool.gvimdiff.layout` and -`mergetool.nvimdiff.layout` instead of `mergetool.vimdiff.layout` +`mergetool.nvimdiff.layout` instead of `mergetool.vimdiff.layout` (though the +latter will be used as fallback if the variant-specific one is not set). In addition, for backwards compatibility with previous Git versions, you can also append `1`, `2` or `3` to either `vimdiff` or any of the variants (ex: |