They'll have to pry Sublime Text from my cold, dead fingers. I want to like Merge, but I find it's UI to be ugly and difficult. I'm still using Tower, but just

They'll have to pry Sublime Text from my cold, dead fingers. I want to like Merge, but I find it's UI to be ugly and difficult. I'm still using Tower, but just got soaked for a very expensive upgrade to Kaleidoscope. UI aside, does Merge have a good diff tool built in?