Merge branch 'maint-1.8.1' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Mar 2013 17:51:10 +0000 (27 10:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Mar 2013 17:51:10 +0000 (27 10:51 -0700)
* 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)

1  2 
Documentation/git-commit.txt
Documentation/git-pull.txt

Simple merge
Simple merge