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)
commitaa3a2c2af600e6aea73df63c11a0eb88a00b6444
tree39b29ea5b7d1662d747c6839f5d63f6a978c60ed
parent3583bf594db0c0459be8aaf26c81d15ffd4b4646
parent87f16258367a3b9a62663b11f898a4a6f3c19d31
Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'

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