diff options
Diffstat (limited to 'man1/git-merge-tree.1')
| -rw-r--r-- | man1/git-merge-tree.1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/man1/git-merge-tree.1 b/man1/git-merge-tree.1 index 8239e107a..8bb026711 100644 --- a/man1/git-merge-tree.1 +++ b/man1/git-merge-tree.1 @@ -2,12 +2,12 @@ .\" Title: git-merge-tree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 03/17/2023 +.\" Date: 03/19/2023 .\" Manual: Git Manual -.\" Source: Git 2.40.0.71.g950264636c +.\" Source: Git 2.40.0.115.ge25cabbf6b .\" Language: English .\" -.TH "GIT\-MERGE\-TREE" "1" "03/17/2023" "Git 2\&.40\&.0\&.71\&.g9502646" "Git Manual" +.TH "GIT\-MERGE\-TREE" "1" "03/19/2023" "Git 2\&.40\&.0\&.115\&.ge25cab" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -187,7 +187,7 @@ This is an integer status followed by a NUL character\&. The integer status is: .nf 0: merge had conflicts 1: merge was clean -<0: something prevented the merge from running (e\&.g\&. access to repository +<0: something prevented the merge from running (e\&.g\&. access to repository objects denied by filesystem) .fi .if n \{\ |