diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:03:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:03:11 -0700 |
| commit | 3f3bb90c8f86279f4708f6b91e90216b285ca599 (patch) | |
| tree | 2c62b93d053e8cb6aaa431cfa3eb677ff0cd96ad /Documentation/git-merge-tree.txt | |
| parent | 96a806f87a379fbc54b5cdb889518e9540d954c9 (diff) | |
| parent | f7111175df0fe258784d6f18ee86f019e889676f (diff) | |
| download | git-3f3bb90c8f86279f4708f6b91e90216b285ca599.tar.gz | |
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
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 88ee942101..ffc4fbf7e8 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -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]] |