diff options
Diffstat (limited to 'man1/git-mergetool.1')
| -rw-r--r-- | man1/git-mergetool.1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1 index a4e7c4eb3..94d4367bd 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: 10/10/2022 +.\" Date: 10/11/2022 .\" Manual: Git Manual -.\" Source: Git 2.38.0.68.ge85701b4af +.\" Source: Git 2.38.0.83.gd420dda057 .\" Language: English .\" -.TH "GIT\-MERGETOOL" "1" "10/10/2022" "Git 2\&.38\&.0\&.68\&.ge85701b" "Git Manual" +.TH "GIT\-MERGETOOL" "1" "10/11/2022" "Git 2\&.38\&.0\&.83\&.gd420dda" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -253,7 +253,7 @@ normally represent the versions of the file from before Git\(cqs conflict resolu \fILOCAL\fR and \fIREMOTE\fR -to be overwriten so that only the unresolved conflicts are presented to the merge tool\&. Can be configured per\-tool via the +to be overwritten so that only the unresolved conflicts are presented to the merge tool\&. Can be configured per\-tool via the \fBmergetool\&.<tool>\&.hideResolved\fR configuration variable\&. Defaults to \fBfalse\fR\&. |