Skip to content

Commit 3f3bb90

Browse files
committed
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
2 parents 96a806f + f711117 commit 3f3bb90

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/git-merge-tree.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ This is an integer status followed by a NUL character. The integer status is:
108108

109109
0: merge had conflicts
110110
1: merge was clean
111-
<0: something prevented the merge from running (e.g. access to repository
111+
<0: something prevented the merge from running (e.g. access to repository
112112
objects denied by filesystem)
113113

114114
[[OIDTLT]]

0 commit comments

Comments
 (0)