Fixed a lot of my confusion with the version control stuff, and I enabled external version control. Hopefully all is still working and makes better sense now:

-Fix version control: "diff last revision" should be "diff with previous revision"-Ensure svn, git, and mercurial "diff with previous revision" all behave like the name suggests (this is what I thought everything was doing the first time, but only svn behaved like this)-When doing external diffs, copy files into temp folder to allow for more sane names for files-Git remove "staged diff" in favor of a single diff which will show staged and unstaged against the base (this is what I wanted from the beginning)-Add external version control options

That is it, I am done for now...unless I, or someone else, finds some bugs. I am going to give it a bit to ensure everything is stable, and if so, I think I will submit to package control.

I didn't actually think I was going to add this much, but I think it has turned into a pretty useful plugin now.

I am not sure if I will support CVS or not. I briefly thought about it. If I am able to setup a free CVS repo somewhere so I can test out client side functionality and figure out how to replicate the same features the other version control systems use for this plugin, then there is a good chance. If I am having to setup my own CVS server just so I can test out client side functionality, it just isn't going to happen. If the interfacing with the CVS binary can't give me what I need, it probably won't happen either (but I this is less likely to be a sticking point).

CVS would probably be the only other system I would consider supporting.

virtuallynothere wrote:Hi, I know this is a noob question, but how can I diff 2 tabs or files, and only select the differences?

IE: I have 2 files with a list computer names, I want to find only the systems missing from 1 file and select the missing systems so that I can put them into a new file.

Thx!!Sully

If I understand correctly what you are asking, you probably want to use the external option by linking easydiff to a 3rd party merge tool. The internal diff functionality is great for quickly seeing the difference. But for merging, I use EasyDiff's external option and merge in an actual merge utility.

If you want to merge inside Sublime, then take a look at Sublimerge http://www.sublimerge.com/. I, personally, have a hard time paying for a merge tool that only works with Sublime, which is why I use EasyDiff connected to a good external merge tool when I actually need to merge.