From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Mar 2013 17:51:10 +0000 (-0700)
Subject: Merge branch 'maint-1.8.1' into maint
X-Git-Tag: v1.8.2.1~29
X-Git-Url: https://repo.or.cz/w/git.git/commitdiff_plain/d011ab4312a8ddabd143567fa9706b8e9fb9c0a4

Merge branch 'maint-1.8.1' into maint

* maint-1.8.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)
---

d011ab4312a8ddabd143567fa9706b8e9fb9c0a4