I've found a merge tool named gpyfm, which is a rewrite of the old TeamWare file merge tool used by Sun Engineers.
Excerpt from the Homepage:
gpyfm was originally written by David Marker (assitant ON Nevada gatekeeper). Richard Lowe, one of the project leads for SCM Migration.
Here is a picture from the tutorial of the merge tool: