Andrew's git / gitweb.git / diff
?
Merge branch 'jc/maint-mergetool-style-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Sep 2012 22:54:25 +0000 (15:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Sep 2012 22:54:25 +0000 (15:54 -0700)
* jc/maint-mergetool-style-fix:
mergetool: style fixes

Trivial merge