diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:03:51 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-02-25 08:03:51 -0800 |
commit | d49f9f178b7efbe45cdd4288a9a7a6a0f023c9e3 (patch) | |
tree | 41ba4a5667706e9ed03a3ada1979273bb3fe0ba6 /commit.h | |
parent | 66d12f97d0712b26f034fbc1ef78eefdadef2bd6 (diff) | |
parent | edbc00e76d29213010db947d8d7bff3baab12a35 (diff) | |
download | git-d49f9f178b7efbe45cdd4288a9a7a6a0f023c9e3.tar.gz |
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
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions