Show patches with: Series = Make diff3 the default conflict style       |    State = Action Required       |    Archived = No       |   7 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[7/7] xdiff: make diff3 the default conflictStyle Make diff3 the default conflict style - - - --- 2021-06-09 Felipe Contreras New
[6/7] xdiff: simplify style assignments Make diff3 the default conflict style - - - --- 2021-06-09 Felipe Contreras New
[5/7] xdiff: rename XDL_MERGE_STYLE_DIFF3 Make diff3 the default conflict style - - - --- 2021-06-09 Felipe Contreras New
[4/7] checkout: fix merge.conflictstyle handling Make diff3 the default conflict style - - - --- 2021-06-09 Felipe Contreras New
[3/7] notes: fix merge.conflictstyle handling Make diff3 the default conflict style - - - --- 2021-06-09 Felipe Contreras New
[2/7] merge-tree: fix merge.conflictstyle handling Make diff3 the default conflict style - - - --- 2021-06-09 Felipe Contreras New
[1/7] test: add merge style config test Make diff3 the default conflict style - - - --- 2021-06-09 Felipe Contreras New