Jonathan Nieder 53204061ac 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>

2021-03-13 15:34:32 -08:00

4.1 KiB

Raw Blame History

View Raw