How do I set up MATLAB as the diff and merge tool for TortoiseGit?

I am using TortoiseGit to manage changes to a repository which contains binary files, such as Simulink models (".slx" or ".mdl" files) or live scripts (".mlx" files).

However, when I attempt to diff or merge these files, git fails because they are not text. How do I configure TortoiseGit to use MATLAB's diff and merge tools for these file types?

Answer 1

[MathWorks Support Team]

TortoiseGit can be configured using the same instructions as for TortoiseSVN (TortoiseGit is heavily based on TortoiseSVN), which can be found in the documentation here:

https://www.mathworks.com/help/releases/R2022b/matlab/matlab_prog/customize-external-source-control-to-use-matlab-for-comparison-and-merge.html#mw_2afe23ea-a7ec-4a9a-a33f-5404a6d6c36d

[Hamid Farshi]

Starting with MATLAB R2024b if you use the new MATLAB Desktop, you have the option of saving your MLX to M based live script. You can also change your settings so that all of your new live scripts would be M based .