Today's Emacs tool: smerge. It highlights conflicts, differences and provides smerge-keep-current to choose between. http://t.co/hyO15HKAOl