diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2021-03-13 00:41:33 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-03-13 15:34:32 -0800 |
| commit | 53204061acbf7a03a6ba050f381e0bf9b01e3a78 (patch) | |
| tree | e088bf64e8c9a853d09cf05b1f0f279cd1944a7f /t/t6403-merge-file.sh | |
| parent | mergetool: do not enable hideResolved by default (diff) | |
| download | tgif-53204061acbf7a03a6ba050f381e0bf9b01e3a78.tar.xz | |
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>
Diffstat (limited to 't/t6403-merge-file.sh')
0 files changed, 0 insertions, 0 deletions