3 ms·Use VSCode for this. Also has three-way merge.by atVelocet 2y agoUse VSCode for this. Also has three-way merge.