diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:19:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:19:03 -0700 |
| commit | 3f5b4a7393b72902269bf06b5b94ede9fc5dee3d (patch) | |
| tree | d81e84bc6cc8245d605e0fca11e849acb97f3374 /git-merge-tree.txt | |
| parent | 42ce67d67656af1241e4ef3aa4133991cccdafe6 (diff) | |
| download | git-htmldocs-3f5b4a7393b72902269bf06b5b94ede9fc5dee3d.tar.gz | |
Autogenerated HTML docs for v2.40.0-115-ge25ca
Diffstat (limited to 'git-merge-tree.txt')
| -rw-r--r-- | git-merge-tree.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-tree.txt b/git-merge-tree.txt index 88ee94210..ffc4fbf7e 100644 --- a/git-merge-tree.txt +++ b/git-merge-tree.txt @@ -108,7 +108,7 @@ This is an integer status followed by a NUL character. The integer status is: 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) [[OIDTLT]] |