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