2 ms·Also magit-ediff ('e' in any merge conflict) is great and maybe a little more intuitive than smergeby aulin 3y agoAlso magit-ediff ('e' in any merge conflict) is great and maybe a little more intuitive than smerge