diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-08 15:29:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-08 15:29:07 -0800 |
| commit | 4dd7c77d19d42f6981ba4cdcda91755e5587cc28 (patch) | |
| tree | 0003225d8e58ad22ce7f23beb9d5c98df4518369 /compat/regex/regex.h | |
| parent | ecf6778e8ef243dd9b34eef57212c44baffb13a2 (diff) | |
| parent | edbc00e76d29213010db947d8d7bff3baab12a35 (diff) | |
Merge branch 'jc/combine-diff-many-parents'
We used to have an arbitrary 32 limit for combined diff input,
resulting in incorrect number of leading colons shown when showing
the "--raw --cc" output.
* 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 'compat/regex/regex.h')
0 files changed, 0 insertions, 0 deletions