From c217b9384e8ecbde866bfb09e88f1d7f87bc7b29 Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Wed, 24 Oct 2018 12:25:43 -0400 Subject: doc: document diff/merge.guitool config keys Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano --- Documentation/merge-config.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Documentation/merge-config.txt') diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 662c2713ca..a7f4ea90c1 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -63,6 +63,12 @@ merge.tool:: Any other value is treated as a custom merge tool and requires that a corresponding mergetool..cmd variable is defined. +merge.guitool:: + Controls which merge tool is used by linkgit:git-mergetool[1] when the + -g/--gui flag is specified. The list below shows the valid built-in values. + Any other value is treated as a custom merge tool and requires that a + corresponding mergetool..cmd variable is defined. + include::mergetools-merge.txt[] merge.verbosity:: -- cgit v1.2.3