Merge branch 'maint-1.8.2' into maint-1.8.3
* maint-1.8.2: Documentation/git-merge.txt: fix formatting of example block
Junio C Hamano committed
Sep 5, 2013 at 14:24 UTC
69490f345943f6f6d7ae52e0e9c870e8b48a5dea
No changes.