Improving diff3 conflict quality -- reducing the prevalence of nested conflicts with recursive merges#1855
Open
newren wants to merge 3 commits intogitgitgadget:masterfrom
Open
Improving diff3 conflict quality -- reducing the prevalence of nested conflicts with recursive merges#1855newren wants to merge 3 commits intogitgitgadget:masterfrom
newren wants to merge 3 commits intogitgitgadget:masterfrom