diff options
Diffstat (limited to 'man1/git-merge-file.1')
| -rw-r--r-- | man1/git-merge-file.1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/man1/git-merge-file.1 b/man1/git-merge-file.1 index 001be070f..5210a4880 100644 --- a/man1/git-merge-file.1 +++ b/man1/git-merge-file.1 @@ -2,12 +2,12 @@ .\" Title: git-merge-file .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/21/2023 +.\" Date: 03/28/2023 .\" Manual: Git Manual -.\" Source: Git 2.40.0.130.g27d43aaaf5 +.\" Source: Git 2.40.0.141.g8d90352acc .\" Language: English .\" -.TH "GIT\-MERGE\-FILE" "1" "03/21/2023" "Git 2\&.40\&.0\&.130\&.g27d43a" "Git Manual" +.TH "GIT\-MERGE\-FILE" "1" "03/28/2023" "Git 2\&.40\&.0\&.141\&.g8d9035" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -61,7 +61,7 @@ If there are conflicts, the user should edit the result and delete one of the al .sp The exit value of this program is negative on error, and the number of conflicts otherwise (truncated to 127 if there are more than that many conflicts)\&. If the merge was clean, the exit value is 0\&. .sp -\fIgit merge\-file\fR is designed to be a minimal clone of RCS \fImerge\fR; that is, it implements all of RCS \fImerge\fR\(aqs functionality which is needed by \fBgit\fR(1)\&. +\fIgit merge\-file\fR is designed to be a minimal clone of RCS \fImerge\fR; that is, it implements all of RCS \fImerge\fR\*(Aqs functionality which is needed by \fBgit\fR(1)\&. .SH "OPTIONS" .PP \-L <label> |