mlDiff
and mlMerge
executable files, then follow the recommended steps for the source control tool you are using.matlabroot
is replaced with the full path to your installation, for example, C:Program FilesMATLABR2020a
..gitconfig
file:mlDiff
and mlMerge
executables to match both the MATLAB installation and the operating system you are using. For more information, see Finding the Full Paths for MATLAB Diff and Merge..gitconfig
file, you must use Linux separators '/'
even on Windows.git difftool
and git mergetool
:git difftool
compares the working copy to the repository copy.mlDiff
and mlMerge
executables to match both the MATLAB installation and the operating system you are using. For more information, see Finding the Full Paths for MATLAB Diff and Merge..slx
files, for example:mlDiff
executable path:mlMerge
executable path:.slx
files, for example:mlDiff
and mlMerge
executables to match both the MATLAB installation and the operating system you are using. For more information, see Finding the Full Paths for MATLAB Diff and Merge.compare
utility cannot be used directly for file merging by the AccuRev client, which passes quoted filenames and expects a particular return code on success. To work around this, create a file ac-merge-shim.sh
in /usr/local/bin/
(or another location of your choosing) with the following content:ac-merge-shim.sh
script executable. For example, run the following command in the macOS Terminal (replacing /usr/local/bin
with the full path to the shim file as necessary):/usr/local/bin/
with the full path to the ac-merge-shim.sh
script.git difftool
command. To resolve conflicting changes after merging files from a branch or remote repository, use git mergetool
.git difftool
command can be run with the --dir-diff
option. This will open a folder comparison showing all the changed files.ad
(short for Araxis diff) and ads
(Araxis diff stage) aliases defined above provide convenient shortcuts to invoke Merge via the git difftool
command. See below for example usage.git difftool
command is a frontend to git diff
and thus accepts git diff
options and arguments. As the Git ad
and ads
aliases defined in the above configuration are simply shortcuts for invoking git difftool
, this means that you can in general pass git diff
arguments to git ad
and git ads
. The examples below show some possibilities, but are by no means exhaustive.git ad
.myfile.c
:myfile.c
:c2061b
:zsh
as your shell and have the EXTENDEDGLOB
option set, you will need to escape the ^
:master
and bugfix
branches:hg
sub-command, arxdiff
:-wait
argument to the compare
utility is required to enable file comparisons to be recompared as a different type (text, binary or image) from within Merge and, in the case when Mercurial launches a folder comparison, to enable file comparisons to be launched from that folder comparison.myfile.c
:myfile.c
:0bc544fad9e6
:p4
) to use Merge:P4DIFF
environment variable to the full path of the araxisp4diff
utility. Also, set the P4MERGE
environment variable to the full path to araxisp4winmrg
..bash_profile
:'${baseFile}'
template is not required when using SmartCVS.compare
utility cannot be used directly to launch Merge, since Subclipse does not appropriately divide the user-specified list of external conflict program parameters. It is therefore necessary to create a shell script that will divide the list of parameters appropriately./usr/local/bin/subclipse-shim.sh
with the following content:~/.subversion
.diff-cmd
and set its value to the path of the Merge araxissvndiff
executable that you have installed on your machine:merge-tool-cmd
line to set the path of the Merge araxissvnmerge
executable:merge-tool-cmd
option is ignored when the value of the diff3-cmd
option is defined. Ensure that the value of the diff3-cmd
option has not been defined.diff3-cmd
configuration option instead of merge-tool-cmd
. (Note that diff3-cmd
is the only option for Subversion versions prior to v1.5.)diff3-cmd
should be set to the path of the Merge araxissvndiff3
command-line utility:svn diff
, svn update
and svn merge
) that require a two or three-way comparison.compare
utility cannot be used directly to launch Merge, since Subversive does not divide the user-specified lists of program arguments appropriately. It is therefore necessary to create a shell script to do this./usr/local/bin/subversive-shim.sh
with the following content:${mine}
, ${base}
and ${theirs}
are used to represent the location of the files to be compared. When a file comparison is invoked, tokens in the list of arguments are replaced with paths to the files to be compared. Unfortunately, Subversive is inconsistent in which tokens it replaces with paths, depending on how the file comparison is invoked in Eclipse. The remote file is sometimes passed using ${base}
and at other times ${theirs}
. Fortunately, when ${base}
is used, ${theirs}
is replaced with no text, and it is therefore possible to create a script that will launch Merge using the paths from ${mine}
and ${theirs}
, unless ${theirs}
is empty text, in which case the paths in ${mine}
and ${base}
are compared instead./usr/local/bin/araxissubversivediff.osa
with the following content:araxissvndiff
command to be installed in a particular location. The command can be copied from the /Applications/Araxis Merge.app/Contents/Utiltities
folder to the required location.--tool araxis
with any command that supports external comparison or merging tools. Alternatively, you can configure Merge as your default tool for various operations as described below.