| commit | 135cc712c39fa7ccf25b9b2b55d1d07fc85c85a4 | |
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | |
| Thu, 14 Mar 2024 17:05:05 +0000 (14 17:05 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 Mar 2024 17:08:52 +0000 (14 10:08 -0700) | ||
| tree | 5a70d7731d848657bf9f8e0cc133effd0f14b297 | treesnapshot (tar.gz zip) |
| parent | 412aff7b3379b182e3331ec66c0657ae4e39d576 | commitdiff |
merge options: add a conflict style member
Add a conflict_style member to `struct merge_options` and `struct
ll_merge_options` to allow callers to override the default conflict
style. This will be used in the next commit.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Add a conflict_style member to `struct merge_options` and `struct
ll_merge_options` to allow callers to override the default conflict
style. This will be used in the next commit.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-ll.c | diffblobblamehistory | |
| merge-ll.h | diffblobblamehistory | |
| merge-ort.c | diffblobblamehistory | |
| merge-recursive.c | diffblobblamehistory | |
| merge-recursive.h | diffblobblamehistory |