diff options
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 |