tree 1ee5bd8057292fc6dfa9edc58b3c2cc7b990f8ab
parent f2df3104ce45bc1ee6d7c16f3a02f1d157c65e07
parent 83c4d380171a2ecd24dd2e04072692ec54a7aaa5
author Junio C Hamano <gitster@pobox.com> 1443477568 -0700
committer Junio C Hamano <gitster@pobox.com> 1443477568 -0700

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