Just a noob here, but I love the way Atom displays and handles merge conflicts; still my editor of choice when I rebase / merge.