| commit | 183ecc3e49dee55de349e2f0759aa4894b3623c7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 15 Apr 2016 01:57:45 +0000 (14 18:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 15 Apr 2016 01:57:46 +0000 (14 18:57 -0700) | ||
| tree | 0aa46dab22e02fa45cc5ca6e4b914fbb6aad2585 | treesnapshot (tar.gz zip) |
| parent | dc66371cdf749089bcd1a22335f40c50d8a6b66d | commitdiff |
| parent | 87f16258367a3b9a62663b11f898a4a6f3c19d31 | commitdiff |
Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint
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
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