diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-10 17:41:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-10 17:41:11 -0700 |
| commit | 123dfdff0d6e886ce5536d39dd77dcd46db8d4c0 (patch) | |
| tree | f4773e28ec45311814abcd32f94ab581a2a24895 /Documentation/config | |
| parent | c237c3fd5f038802f3d390c2e1aba9d0fd2f1fd9 (diff) | |
| parent | 980145f7470e20826ca22d7343494712eda9c81d (diff) | |
| download | git-123dfdff0d6e886ce5536d39dd77dcd46db8d4c0.tar.xz | |
Merge branch 'fr/vimdiff-layout'
Reimplement "vimdiff[123]" mergetool drivers with a more generic
layout mechanism.
* fr/vimdiff-layout:
mergetools: add description to all diff/merge tools
vimdiff: add tool documentation
vimdiff: integrate layout tests in the unit tests framework ('t' folder)
vimdiff: new implementation with layout support
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/mergetool.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt index cafbbef46a..90b3809700 100644 --- a/Documentation/config/mergetool.txt +++ b/Documentation/config/mergetool.txt @@ -45,6 +45,15 @@ mergetool.meld.useAutoMerge:: value of `false` avoids using `--auto-merge` altogether, and is the default value. +mergetool.vimdiff.layout:: + The vimdiff backend uses this variable to control how its split + windows look like. Applies even if you are using Neovim (`nvim`) or + gVim (`gvim`) as the merge tool. See BACKEND SPECIFIC HINTS section +ifndef::git-mergetool[] + in linkgit:git-mergetool[1]. +endif::[] + for details. + mergetool.hideResolved:: During a merge Git will automatically resolve as many conflicts as possible and write the 'MERGED' file containing conflict markers around |