From: Andreas Schwab Date: Sat, 4 Mar 2023 17:00:46 +0000 (+0100) Subject: git-merge-tree.txt: replace spurious HTML entity X-Git-Tag: v2.41.0-rc0~151^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7111175df0fe258784d6f18ee86f019e889676f;p=thirdparty%2Fgit.git git-merge-tree.txt: replace spurious HTML entity Signed-off-by: Andreas Schwab Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index 04bcc416e6..c0baa3702c 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -103,7 +103,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]]