summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-26 13:37:22 -0800
committerJunio C Hamano <gitster@pobox.com>2016-02-26 13:37:22 -0800
commitc1fa85ff8ceae0e882d19b1548de407994ee4180 (patch)
treef292383fd2073b0d2315411471b10163fc396523 /templates
parent1e4c08ff7e0f1d17b4a8e2c04edca8fc00455881 (diff)
parent4867f1184c943f7738bb7b42cab2e62cf16cdb18 (diff)
downloadgit-c1fa85ff8ceae0e882d19b1548de407994ee4180.tar.gz
Merge branch 'ps/plug-xdl-merge-leak'
* ps/plug-xdl-merge-leak: xdiff/xmerge: fix memory leak in xdl_merge
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions