Sync with maint
* maint: Documentation/git-merge.txt: fix formatting of example block
Junio C Hamano committed
Sep 5, 2013 at 14:41 UTC
d2dbd399fa03b37ce797ed6fc609574a7e677079
No changes.
* maint: Documentation/git-merge.txt: fix formatting of example block
No changes.