diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 13:25:23 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 13:25:23 -0700 |
commit | ba8baee8618696a4405a1c7feb93ce8d3b089795 (patch) | |
tree | 36a0a7f824df6259cd09b0081e297b366279ab46 /git-mergetool.txt | |
parent | b2e63923b4a1650cdd5c8d919dacf6c650940a92 (diff) | |
download | git-htmldocs-ba8baee8618696a4405a1c7feb93ce8d3b089795.tar.gz |
Autogenerated HTML docs for v2.37.3-662-g36f8e7e
Diffstat (limited to 'git-mergetool.txt')
-rw-r--r-- | git-mergetool.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index f784027bc..c44e20562 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -102,6 +102,9 @@ success of the resolution after the custom tool has exited. CONFIGURATION ------------- :git-mergetool: 1 + +include::includes/cmd-config-section-all.txt[] + include::config/mergetool.txt[] TEMPORARY FILES |