| commit | d49f9f178b7efbe45cdd4288a9a7a6a0f023c9e3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Feb 2013 16:03:51 +0000 (25 08:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Feb 2013 16:03:51 +0000 (25 08:03 -0800) | ||
| tree | 41ba4a5667706e9ed03a3ada1979273bb3fe0ba6 | treesnapshot (tar.gz zip) |
| parent | 66d12f97d0712b26f034fbc1ef78eefdadef2bd6 | commitdiff |
| parent | edbc00e76d29213010db947d8d7bff3baab12a35 | commitdiff |
Merge branch 'jc/combine-diff-many-parents' into maint
* jc/combine-diff-many-parents:
t4038: add tests for "diff --cc --raw <trees>"
combine-diff: lift 32-way limit of combined diff
* jc/combine-diff-many-parents:
t4038: add tests for "diff --cc --raw <trees>"
combine-diff: lift 32-way limit of combined diff