Junio C Hamano 8617715cc0 Merge branch 'maint' ...

* 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)

2013-03-27 10:58:07 -07:00

15 KiB

Raw Blame History

View Raw