Merge branch 'nb/doc-mergetool-typofix' into maint-2.38

[thirdparty/git.git] / Documentation / config / mergetool.txt

diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
index f691afa93d6c69896a0fbab587ebcba0c1073ccc..e779a122d8a78f10adb6381a9d00e9041b2c5b70 100644 (file)
--- 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