From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Sep 2012 18:10:23 +0000 (-0700)
Subject: Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11
X-Git-Tag: v1.7.11.6~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23242a6f9e838013fbfddd4e8eb023d8c9328d37;p=git.git

Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11

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

23242a6f9e838013fbfddd4e8eb023d8c9328d37