diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-06 23:33:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-06 23:33:44 -0800 |
| commit | 85cf82ff01ed975c31b75540afb1b251da5259fd (patch) | |
| tree | 4be6021a07f5db063798873e8fd3a3edacab8907 /commit.h | |
| parent | f9d29daba64ae2c81ed62d0c1f4c5e4493247f6b (diff) | |
| parent | c5a6f65527aa3b6f5d7cf25437a88d8727ab0646 (diff) | |
Merge branch 'en/merge-ort-2'
More "ORT" merge strategy.
* en/merge-ort-2:
merge-ort: add modify/delete handling and delayed output processing
merge-ort: add die-not-implemented stub handle_content_merge() function
merge-ort: add function grouping comments
merge-ort: add a paths_to_free field to merge_options_internal
merge-ort: add a path_conflict field to merge_options_internal
merge-ort: add a clear_internal_opts helper
merge-ort: add a few includes
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions