Phillip Wood (4): xdiff-interface: refactor parsing of merge.conflictstyle merge-ll: introduce LL_MERGE_OPTIONS_INIT merge options: add a conflict style member checkout: cleanup --conflict=<style> parsing builtin/checkout.c | 40 +++++++++++++++++++++------------------- merge-ll.c | 6 ++++-- merge-ll.h | 5 +++++ merge-ort.c | 3 ++- merge-recursive.c | 5 ++++- merge-recursive.h | 1 + t/t7201-co.sh | 6 ++++++ xdiff-interface.c | 29 ++++++++++++++++++----------- xdiff-interface.h | 1 + 9 files changed, 62 insertions(+), 34 deletions(-) base-commit: b387623c12f3f4a376e4d35a610fd3e55d7ea907 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1684%2Fphillipwood%2Frefactor-conflict-style-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1684/phillipwood/refactor-conflict-style-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/1684 -- gitgitgadget
