From: Junio C Hamano <redacted>
Date: Mon, 28 Sep 2015 21:59:28 +0000 (-0700)
Subject: Merge branch 'jk/xdiff-memory-limits' into maint-2.3
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=92cdfd21313c5bf5657d4ac2d3e6ae7af7e9ce94;p=git.git

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

92cdfd21313c5bf5657d4ac2d3e6ae7af7e9ce94