mirror of
https://github.com/git/git.git
synced 2026-01-13 04:06:01 +00:00
* maint:
More fixes for 1.8.2.1
merge-tree: fix typo in merge-tree.c::unresolved
git-commit doc: describe use of multiple `-m` options
git-pull doc: fix grammo ("conflicts" is plural)