commit | 92cdfd21313c5bf5657d4ac2d3e6ae7af7e9ce94 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Mon Sep 28 14:59:28 2015 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Mon Sep 28 14:59:28 2015 -0700 |
tree | 1ee5bd8057292fc6dfa9edc58b3c2cc7b990f8ab | |
parent | f2df3104ce45bc1ee6d7c16f3a02f1d157c65e07 [diff] | |
parent | 83c4d380171a2ecd24dd2e04072692ec54a7aaa5 [diff] |
Merge branch 'jk/xdiff-memory-limits' into maint-2.3