Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:57:45 +0000 (18:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:57:46 +0000 (18:57 -0700)
commit183ecc3...49dee55de349e2f0759aa4894b3623c7
tree0aa46da...22e02fa45cc5ca6e4b914fbb6aad2585copy hash to clipboard (tree)
parentdc66371...df749089bcd1a22335f40c50d8a6b66dcopy hash to clipboard (diff)
parent87f1625...367a3b9a62663b11f898a4a6f3c19d31copy hash to clipboard (diff)