Merge-tracking is when your version control system keeps track of how lines of development (branches) diverge and re-form together.

…

While Subversion 1.5 doesn’t make merging as easy as a system like Git or Mercurial, it certainly solves common points of pain. 

It’s no surprise that they mention Git, as it’s starting to gain some serious traction (notably within the Ruby/Rails community)  thanks to it’s superior branch handling.

I haven’t been entirely convinced that the switch to Git would make sense for me. Branching an entire project is something I need to do only occasionally (one of those times being this week, coincidentally) and the other benefits Git offers, while appealing, aren’t enough to make me think I can’t live without it.

Now with SVN improving one of the two flaws I think it has (the other being it leaving .svn directories littered throughout your project, something which I believe is also going to be fixed), I think I may well stick with what I know for the time being!