master
Recognize conflict markers that have no label
Pick both hunks, not the common ancestor, in diff3 conflicts
Fix linter warning about inefficient string concatenation
Make the conflict marker size a parameter of our marker matching