From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Sep 2015 21:59:28 +0000 (-0700)
Subject: Merge branch 'jk/xdiff-memory-limits' into maint-2.3
X-Git-Tag: v2.3.10~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/92cdfd21313c5bf5657d4ac2d3e6ae7af7e9ce94?hp=--cc

Merge branch 'jk/xdiff-memory-limits' into maint-2.3
---

92cdfd21313c5bf5657d4ac2d3e6ae7af7e9ce94