Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11
* jc/maint-mergetool-style-fix: mergetool: style fixes
Junio C Hamano committed
Sep 11, 2012 at 11:10 UTC
23242a6f9e838013fbfddd4e8eb023d8c9328d37
No changes.