Hacker News new | ask | show | jobs
by aulin 973 days ago
Also magit-ediff ('e' in any merge conflict) is great and maybe a little more intuitive than smerge