Show patches with: Series = checkout: cleanup --conflict=       |   5 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v2,5/5] checkout: fix interaction between --conflict and --merge checkout: cleanup --conflict= - - - --- 2024-03-14 Phillip Wood Accepted
[v2,4/5] checkout: cleanup --conflict=<style> parsing checkout: cleanup --conflict= - - - --- 2024-03-14 Phillip Wood Accepted
[v2,3/5] merge options: add a conflict style member checkout: cleanup --conflict= - - - --- 2024-03-14 Phillip Wood Accepted
[v2,2/5] merge-ll: introduce LL_MERGE_OPTIONS_INIT checkout: cleanup --conflict= - - - --- 2024-03-14 Phillip Wood Accepted
[v2,1/5] xdiff-interface: refactor parsing of merge.conflictstyle checkout: cleanup --conflict= - - - --- 2024-03-14 Phillip Wood Accepted