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:
commit
3f3bb90c8f
@ -108,7 +108,7 @@ This is an integer status followed by a NUL character. The integer status is:
|
|||||||
|
|
||||||
0: merge had conflicts
|
0: merge had conflicts
|
||||||
1: merge was clean
|
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)
|
objects denied by filesystem)
|
||||||
|
|
||||||
[[OIDTLT]]
|
[[OIDTLT]]
|
||||||
|
Loading…
Reference in New Issue
Block a user