[andig]

Sublime Merge looks a lot like SourceTree from the approach it takes. Must say that I'm happy with SourceTree after having had a slow start...