| 69 | } |
| 70 | |
| 71 | int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s) |
| 72 | { |
| 73 | if (!strcmp(v, "manual")) |
| 74 | *s = NOTES_MERGE_RESOLVE_MANUAL; |
| 75 | else if (!strcmp(v, "ours")) |
| 76 | *s = NOTES_MERGE_RESOLVE_OURS; |
| 77 | else if (!strcmp(v, "theirs")) |
| 78 | *s = NOTES_MERGE_RESOLVE_THEIRS; |
| 79 | else if (!strcmp(v, "union")) |
| 80 | *s = NOTES_MERGE_RESOLVE_UNION; |
| 81 | else if (!strcmp(v, "cat_sort_uniq")) |
| 82 | *s = NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ; |
| 83 | else |
| 84 | return -1; |
| 85 | |
| 86 | return 0; |
| 87 | } |
| 88 | |
| 89 | static combine_notes_fn parse_combine_notes_fn(const char *v) |
| 90 | { |
no outgoing calls
no test coverage detected