4 ms·Your editor should be able to handle this (via git mergetool).by aragilar 2y agoYour editor should be able to handle this (via git mergetool).