Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:10:23 +0000 (11:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:10:23 +0000 (11:10 -0700)
commit23242a6f9e838013fbfddd4e8eb023d8c9328d37
tree2185ffc6becaf4da9a6fefe10db1f61979872f33
parentee7a83f6314a6fe281c8e3e041cfd42b5a2deb44
parentf8750a0ea951a328481b67b5d0558c0402f0cdfd
Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11

* jc/maint-mergetool-style-fix:
  mergetool: style fixes