From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Nov 2010 17:36:49 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~156
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=31731b0ea4fccf5455ce367d483feaabdc411e0a;p=git.git

Merge branch 'maint'

* maint:
  Fix a formatting error in git-merge.txt
---

31731b0ea4fccf5455ce367d483feaabdc411e0a