I just discovered that there is a nice plugin for visually diffing and merging files in Sublime Text (both 2 and 3) - Sublimerge (http://www.sublimerge.com/ htt

I just discovered that there is a nice plugin for visually diffing and merging files in Sublime Text (both 2 and 3) - Sublimerge (http://www.sublimerge.com/ http://www.sublimerge.com/)