A generic merge manager for DVCS's