Merge branch 'jc/maint-mergetool-style-fix'
* jc/maint-mergetool-style-fix: mergetool: style fixes
Junio C Hamano committed
Sep 3, 2012 at 15:54 UTC
4052719f6dde13c85ddb2f25ee647506bdc7868b
No changes.
* jc/maint-mergetool-style-fix: mergetool: style fixes
No changes.