Show patches with: Series = Implement new zdiff3 conflict style       |   2 patches
Patch Series A/R/T S/W/F Date Submitter Delegate State
[v4,2/2] update documentation for new zdiff3 conflictStyle Implement new zdiff3 conflict style - - - --- 2021-11-16 Elijah Newren Accepted
[v4,1/2] xdiff: implement a zealous diff3, or "zdiff3" Implement new zdiff3 conflict style - - - --- 2021-11-16 Phillip Wood Accepted