1
0
mirror of https://github.com/git/git synced 2024-07-04 16:48:40 +00:00

Merge branch 'as/doc-markup-fix'

Fix for a mis-mark-up in doc made in Git 2.39 days.

* as/doc-markup-fix:
  git-merge-tree.txt: replace spurious HTML entity
This commit is contained in:
Junio C Hamano 2023-03-19 15:03:11 -07:00
commit 3f3bb90c8f

View File

@ -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]]