| commit | 23e45b1de11bd6bc3590d331b035a098510c0437 | |
| author | Kyle J. McKay <mackyle@gmail.com> | |
| Thu, 2 Sep 2021 22:25:20 +0000 (2 15:25 -0700) | ||
| committer | Kyle J. McKay <mackyle@gmail.com> | |
| Thu, 2 Sep 2021 22:25:20 +0000 (2 15:25 -0700) | ||
| tree | 0074bd43203c0994ed12c61b7ba678e915829b96 | treesnapshot (tar.gz zip) |
| parent | 585648f2a225a3b0f0f7d5ff6d0ec6bb44f1e558 | commitdiff |
README_DOCS.rst: add 3-way merge glossary reference
When Git mentions them, they are often referred to as
a "3-way merge" rather than a "three-way merge".
Add a glossary reference for "3-way merge" that points
to "three-way merge".
Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
When Git mentions them, they are often referred to as
a "3-way merge" rather than a "three-way merge".
Add a glossary reference for "3-way merge" that points
to "three-way merge".
Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
| README_DOCS.rst | diffblobblamehistory |