Subversion (SVN)

The greatest source control system on this world!

But I am disappointed that TortoiseMerge is not able to merge simple things: