projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dc66371 87f1625)
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)
commit183ecc3e49dee55de349e2f0759aa4894b3623c7
tree0aa46dab22e02fa45cc5ca6e4b914fbb6aad2585tree | snapshot
parentdc66371cdf749089bcd1a22335f40c50d8a6b66dcommit | diff
parent87f16258367a3b9a62663b11f898a4a6f3c19d31commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.