diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-17 15:56:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-17 15:56:15 -0700 |
| commit | 3692c01e1b89453b05f8049443583bfa935f300c (patch) | |
| tree | 138d2e51f52b4c92d0400a41fd2208cf88ce9140 /git-mergetool.txt | |
| parent | 9cd0e308d264049c39066e0eeff52e065c2bb8c9 (diff) | |
| download | git-htmldocs-3692c01e1b89453b05f8049443583bfa935f300c.tar.gz | |
Autogenerated HTML docs for v2.31.0
Diffstat (limited to 'git-mergetool.txt')
| -rw-r--r-- | git-mergetool.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-mergetool.txt b/git-mergetool.txt index 6b14702e7..e587c7763 100644 --- a/git-mergetool.txt +++ b/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. |