kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2023-03-19 15:03:11 -07:00
parent 96a806f87a f7111175df
commit 3f3bb90c8f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-merge-tree.txt
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]]