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)
commit23242a6...9e838013fbfddd4e8eb023d8c9328d37
tree2185ffc...becaf4da9a6fefe10db1f61979872f33copy hash to clipboard (tree)
parentee7a83f...314a6fe281c8e3e041cfd42b5a2deb44copy hash to clipboard (diff)
parentf8750a0...a951a328481b67b5d0558c0402f0cdfdcopy hash to clipboard (diff)