From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Mar 2013 17:58:07 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.3-rc0~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8617715cc09b7422fe31189f9476f6ade73ede70;p=thirdparty%2Fgit.git

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

8617715cc09b7422fe31189f9476f6ade73ede70