diff options
Diffstat (limited to 'man1/git-mergetool.1')
| -rw-r--r-- | man1/git-mergetool.1 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1 index 6d06abae1..8b6d0678c 100644 --- a/man1/git-mergetool.1 +++ b/man1/git-mergetool.1 @@ -2,12 +2,12 @@ .\" Title: git-mergetool .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MERGETOOL" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MERGETOOL" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -152,6 +152,8 @@ configuration variable (see \fB\-O/dev/null\fR\&. .RE .SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: .PP mergetool\&.<tool>\&.path .RS 4 |