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

Trivial merge