Merge branch 'ps/plug-xdl-merge-leak' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:49 +0000 (11:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:49 +0000 (11:13 -0800)
commit4da4026...5d2998b4735dd219b03848b47d2389cf
treed1b7fe9...cf64f1903e04b4b5d1658f0788402c8bcopy hash to clipboard (tree)
parent08e21c9...5f3996152080ff22d33d9d2866a3dc26copy hash to clipboard (diff)
parent4867f11...4c943f7738bb7b42cab2e62cf16cdb18copy hash to clipboard (diff)
xdiff/xmerge.c