medini unite is a very usefull tool that allows you to diff and merge MATLAB®/ Simulink®/ Stateflow®/ Targetlink models:
- difference analysis and model merge
- user controlled and automated, 2-way and 3-way
- integrated with configuration management systems
- generates change and merge reports
- very user friendly user interface, based on Eclipse
- Floating/dongle/or single user licensing
More info on
http://www.ikv.de/mediniunite/
Trial on simple request
http://www.ikv.de/index.php?option=com_facileforms&Itemid=97
or at vartanian@ikv.de