From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Sep 2012 22:54:25 +0000 (-0700)
Subject: Merge branch 'jc/maint-mergetool-style-fix'
X-Git-Tag: v1.8.0-rc0~108
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4052719f6dde13c85ddb2f25ee647506bdc7868b;p=git.git

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

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

4052719f6dde13c85ddb2f25ee647506bdc7868b