Codeville - and yet another version control system, this one is written in Python and specifically addresses the problem of merge algorithms.