SimMerge is the industry-standard Simulink diff/merge tool
SimMerge is the industry-standard Simulink diff/merge tool, and supports both two- and three-way merge for Simulink models.