From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat, 13 Mar 2021 08:41:33 +0000 (-0800)
Subject: doc: describe mergetool configuration in git-mergetool(1)
X-Git-Tag: v2.31.0~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53204061acbf7a03a6ba050f381e0bf9b01e3a78;p=thirdparty%2Fgit.git

doc: describe mergetool configuration in git-mergetool(1)

In particular, this describes mergetool.hideResolved, which can help
users discover this setting (either because it may be useful to them
or in order to understand mergetool's behavior if they have forgotten
setting it in the past).

Tested by running

	make -C Documentation git-mergetool.1
	man Documentation/git-mergetool.1

and reading through the page.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 6b14702e78..e587c7763a 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -99,6 +99,10 @@ success of the resolution after the custom tool has exited.
 	(see linkgit:git-config[1]).  To cancel `diff.orderFile`,
 	use `-O/dev/null`.
 
+CONFIGURATION
+-------------
+include::config/mergetool.txt[]
+
 TEMPORARY FILES
 ---------------
 `git mergetool` creates `*.orig` backup files while resolving merges.