3 ms·I think clang got support for detecting unresolved merge conflicts around a decade ago too.by jamesfinlayson 5y agoI think clang got support for detecting unresolved merge conflicts around a decade ago too.