Andrew's git / gitweb.git / diff
?
Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Sep 2013 21:41:40 +0000 (14:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Sep 2013 21:41:40 +0000 (14:41 -0700)
* maint:
Documentation/git-merge.txt: fix formatting of example block

Trivial merge