3 ms·
It is also a tool to resolve merges as well.
by encryptluks2 5y ago
It is also a tool to resolve merges as well.
- lilyball 5y agoIt can display merge conflicts (as Git can display those) but it doesn't resolve them. It's purely a display tool. Its installation instructions recommend setting `merge.conflictstyle = diff3` but that's not an automatic process.