We're using Matlab Simulink for model development (and Real-Time Workshop autocoding) within a team of several developers.
We currently use Visual Source Safe (yes, I know its terrible) for version control, using locks to prevent conflicting changes.
We'd like to migrate our programme to a different version control system (svn, hg or git), but we're concerned about performing merges and diffs on Simulink .mdl files.
Does anybody have useful experience in performing merges on Simulink files?
Text merging of Simulink model files will be difficult. Here's an article which gives some information on configuration management when using Simulink.
As for diffs, there is a differencing tool in the Simulink Report Generator starting I believe in R2008b+. Here's a link to the doc for that feature.