diff options
Diffstat (limited to 'man1/git-mergetool--lib.1')
| -rw-r--r-- | man1/git-mergetool--lib.1 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/man1/git-mergetool--lib.1 b/man1/git-mergetool--lib.1 index f8dc2f87d..52fb22f79 100644 --- a/man1/git-mergetool--lib.1 +++ b/man1/git-mergetool--lib.1 @@ -2,12 +2,12 @@ .\" Title: git-mergetool--lib .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MERGETOOL\-\-LIB" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MERGETOOL\-\-LIB" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -46,7 +46,7 @@ Before sourcing \fIgit\-mergetool\-\-lib\fR, your script must set \fBTOOL_MODE\f .PP get_merge_tool .RS 4 -returns a merge tool\&. the return code is 1 if we returned a guessed merge tool, else 0\&. +Returns a merge tool\&. The return code is 1 if we returned a guessed merge tool, else 0\&. \fI$GIT_MERGETOOL_GUI\fR may be set to \fItrue\fR @@ -55,22 +55,22 @@ to search for the appropriate guitool\&. .PP get_merge_tool_cmd .RS 4 -returns the custom command for a merge tool\&. +Returns the custom command for a merge tool\&. .RE .PP get_merge_tool_path .RS 4 -returns the custom path for a merge tool\&. +Returns the custom path for a merge tool\&. .RE .PP initialize_merge_tool .RS 4 -bring merge tool specific functions into scope so they can be used or overridden\&. +Brings merge tool specific functions into scope so they can be used or overridden\&. .RE .PP run_merge_tool .RS 4 -launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present\&. +Launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present\&. \fI$MERGED\fR, \fI$LOCAL\fR, \fI$REMOTE\fR, and |