Merge branch 'da/mergetools-p4' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2012 03:31:40 +0000 (19:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2012 03:31:40 +0000 (19:31 -0800)
commit6c95f53...e909b91d3c8868f00196c85c61fe8142
tree5b3e7ce...784951a0acdb4c58caa8507cb2383cefcopy hash to clipboard (tree)
parent3424da1...18786209f7ac41dd273e72a081421cd3copy hash to clipboard (diff)
parent3facc60...31a5b860cae8cb26957e5b4e80820c34copy hash to clipboard (diff)