Andrew's git / gitweb.git / diff
?
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)
A small memory leak in an error codepath has been plugged in xdiff
code.

* rj/xdiff-prepare-plug-leak-on-error-codepath:
xdiff/xprepare: fix a memory leak
xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits

Trivial merge