diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-28 14:59:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 14:59:28 -0700 |
| commit | 92cdfd21313c5bf5657d4ac2d3e6ae7af7e9ce94 (patch) | |
| tree | 1ee5bd8057292fc6dfa9edc58b3c2cc7b990f8ab /merge-blobs.c | |
| parent | Merge branch 'jk/transfer-limit-redirection' into maint-2.3 (diff) | |
| parent | merge-file: enforce MAX_XDIFF_SIZE on incoming files (diff) | |
| download | git-92cdfd21313c5bf5657d4ac2d3e6ae7af7e9ce94.tar.gz git-92cdfd21313c5bf5657d4ac2d3e6ae7af7e9ce94.zip | |
Merge branch 'jk/xdiff-memory-limits' into maint-2.3
Diffstat (limited to 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions