How do I configure Araxis Merge for use with Git?

Question

I understand that Araxis Merge is now a \"fully supported\" mergetool for Git, so that much of what I can find about configuring Git to use it is now out of dat

Answer 1

If you use SourceTree (I'm using v3.0.8) it's very easy to configure Araxis merge as the external diff tool:

For using Araxis Merge to view file differences:

• Install Araxis Merge
• In SourceTree: Tools > Options > Diff > External Diff Tool > select AraxisMerge from dropdown > OK

(No need to define the Arguments, no need to restart SourceTree)

Example use:

• Right-click an uncommitted file that you want to compare > select 'External Diff' (or select file then CTRL-D) - this will compare the differences between your latest changes and your local repo.