Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:29:33 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2016 17:29:33 +0000 (10:29 -0700)
commitaa3a2c2...f600e6aea73df63c11a0eb88a00b6444
tree39b29ea...b7d1662d747c6839f5d63f6a978c60edcopy hash to clipboard (tree)
parent3583bf5...4db0c0459be8aaf26c81d15ffd4b4646copy hash to clipboard (diff)
parent87f1625...367a3b9a62663b11f898a4a6f3c19d31copy hash to clipboard (diff)