Merge branch 'jk/mergetool'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2013 22:41:57 +0000 (14:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2013 22:41:57 +0000 (14:41 -0800)
commit55f56fe...0765820d5c841e47b22f33f5a7253e16
tree77f46ce...ac859508725ae00d0f60b95b7799b671copy hash to clipboard (tree)
parentb9a5f68...1d186ec2420df39e3ec8087c7166a636copy hash to clipboard (diff)
parent073678b...e6324a155fa99f40eee0637941a70a34copy hash to clipboard (diff)