diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:54 -0800 |
| commit | bc32aa1e63218b0011159af4703e1389354c69f9 (patch) | |
| tree | ef71f37f6d61608d2853e9590830d719618f636b /t/lib-merge.sh | |
| parent | Merge branch 're/color-default-reset' (diff) | |
| parent | parse-options.c: use "enum parse_opt_result" for parse_nodash_opt() (diff) | |
| download | tgif-bc32aa1e63218b0011159af4703e1389354c69f9.tar.xz | |
Merge branch 'ab/parse-options-cleanup'
Change the type of an internal function to return an enum (instead
of int) and replace -2 that was used to signal an error with -1.
* ab/parse-options-cleanup:
parse-options.c: use "enum parse_opt_result" for parse_nodash_opt()
Diffstat (limited to 't/lib-merge.sh')
0 files changed, 0 insertions, 0 deletions