Sublimerge: diff and merge files visually in Sublime Text 2 and 3
sublimerge.com