I always have found diffing in a number of plugins awkward. My need isn't to merge them directly in Sublime; I usually use an external tool to do such things (the right tool for the job and all that). But I do often want to see a quick diff. I was looking for something less awkward and a bit more intuitive for myself, so I wrote a personal plugin that I have not released, but if anyone likes it, they can use it:
Its just two files that you can drop in your user folder (only for ST3):https://github.com/facelessuser/sublime ... sy_diff.pyhttps://github.com/facelessuser/sublime ... e-settings
It basically creates a dynamic context menu in the file's view window to allow a more intuitive selection of files to diff, and allows you to easily see what you have stored in the left side. It does the basic single view diff, but I find it useful. It also tracks when a view that is on the left side has been closed, so the context menu will update accordingly if the view is no longer available.
Since I haven't released this, use at your own risk, and I am not really taking feature requests or offering support; there would have to be a pretty big desire for this to be on Package Control for me to support another repo (which I doubt there will be; there are plenty of diff packages available). I just find the dynamic context menu more intuitive for my needs. I am sure one of the many diff packages out there could pick up a feature like this...I just haven't seen it yet. Maybe by posting this here, someone will pick up a feature like this, and then I can just use their diff plugin