easy-conflict is a terminal native Git mergetool with a 3 pane IntelliJ like resolver. It focuses on conflict blocks and writes the resolved result back to the merged file.
Some results have been hidden because they may be inaccessible to you
Show inaccessible results