git-merge in the Git documentation (source code)

= git-merge in the Git documentation
{c}

Primary documentation: https://git-scm.com/docs/git-merge

Locator: Description, fast-forward/true merge and conflicts.