Merge branch 'maint'
* maint: Fix a formatting error in git-merge.txt
Junio C Hamano committed
Nov 5, 2010 at 10:36 UTC
31731b0ea4fccf5455ce367d483feaabdc411e0a
No changes.
* maint: Fix a formatting error in git-merge.txt
No changes.