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)
commit4052719f6dde13c85ddb2f25ee647506bdc7868b
treeb7231e1c47ff58ef6a68f7b933058ad395afa380
parent81dbbf72406c47b5199a59c6b83338b11fd3e754
parentf8750a0ea951a328481b67b5d0558c0402f0cdfd
Merge branch 'jc/maint-mergetool-style-fix'

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