This is one of the reasons I have always liked Bazaar; the pluggable back-end could hypothetically store any kind of content; the pluggable front-end could hypothetically invoke editors (GIMP, Photoshop, whatever) with appropriate plugins for merging and conflict resolution.