diff options
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]] |