diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2023-03-04 20:00:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-06 22:29:25 +0300 |
| commit | f7111175df0fe258784d6f18ee86f019e889676f (patch) | |
| tree | ef47cbe84e8783ecbc60c440ee04855d38d93b4d /Documentation/git-merge-tree.txt | |
| parent | 768bb238c4843bf52847773a621de4dffa6b9ab5 (diff) | |
git-merge-tree.txt: replace spurious HTML entity
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
| -rw-r--r-- | Documentation/git-merge-tree.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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]] |