Hello, I'd like to configure git with a specific merge tool to merge Simulink model files. I have followed the steps to configure the merge tool successfully. I typed the following on Git Bash: git config --system mergetool.<merge_tool_name>.cmd '"<merge_tool_path>" -base "$BASE" -local "$LOCAL" -remote "$REMOTE" -merged "$MERGED"' where: - <merge_tool_name> is the name of the specific merge tool - <merge_tool_path> is the full path to the .exe file for the merge tool - the merge tool accepts the -base, -local, -remote and -merged arguments Then, after a merge detects conflicts on a Simulink model, I run the following command on the Git Bash: git mergetool -t <merge_tool_name> <model_name>.mdl This command properly launches the GUI of the merge tool, however it indicates that provided file names are invalid. They are of the form: <model_name>.mdl.<revision>.#.mdl, where <revision> is either LOCAL, REMOTE or BASE and # is a number. The merge tool needs to open the model in MATLAB and MATLAB does not allow opening models with '.' in their names. Thus, is there a way to configure Git so that temporary models are of the form <model_name>_mdl_<revision>_#.mdl instead of < model_name>.mdl.<revision>.#.mdl? Other temp file name should also be ok as long as the file does not contains dots in the part that corresponds to the file name. Thanks in advance, Sergio -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html