Merge branch 'jk/mergetool-lib-refactor'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2013 20:48:53 +0000 (13:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Jun 2013 20:48:53 +0000 (13:48 -0700)
commit6f37238...47002b8118d92bc0ec6c986a5d7e56ad
tree4007679...f6955066ea0d7c69cc176a13f17d4e0ecopy hash to clipboard (tree)
parentc47d438...c7972bf94bd5ee425c3806398e00cb4dcopy hash to clipboard (diff)
parentd2512fc...4fe75d8836a6fc965951d8180dbddbe6copy hash to clipboard (diff)