diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-02-17 13:22:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-17 13:22:17 -0800 |
| commit | cbecc168d4264d93295cd1e0a48dc19f0ed1880c (patch) | |
| tree | 930d8f95060899f4abe7176b6d7437677c62ec14 /merge-recursive.c | |
| parent | Merge branch 'bc/hash-independent-tests-part-8' (diff) | |
| parent | parse-options: simplify parse_options_dup() (diff) | |
| download | tgif-cbecc168d4264d93295cd1e0a48dc19f0ed1880c.tar.xz | |
Merge branch 'rs/parse-options-concat-dup'
Code clean-up.
* rs/parse-options-concat-dup:
parse-options: simplify parse_options_dup()
parse-options: const parse_options_concat() parameters
parse-options: factor out parse_options_count()
parse-options: use COPY_ARRAY in parse_options_concat()
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions