Launch External Merge Tool For Sourcetree

  

Tool

LaunchEdit online

SourceTree config First, open up the options window and go to Diff tab. Change both External Diff Tool and Merge Tool to Custom. In the Diff Command field enter the full path to the vsdiffmerge.exe. So if you configure the SemanticMerge, it will be run for all files when you decide to launch 'external diff or merge tool'. SemanticMerge will warn you if it is invoked with an unsupported file type. Then, you will be able to launch the text based diff or merge tool.

ToolForThe file comparison tool can be integrated with Sourcetree so that you can use it to compare changes. The advantages of doing this include:
  • The OxygenCompare Files tool presents the files side-by-side and makes it much easier to determine real changes.
  • The OxygenCompare Files tool includes XML comparison algorithms.
  • The OxygenCompare Files tool includes various options for configuring the comparison.
  • The OxygenCompare Files tool allows you to navigate through changes.

To integrate the Compare Files tool with Sourcetree, follow this procedure, depending on your operating system:

Windows
  1. In Sourcetree, go to Tools > Options.
  2. Go to the Diff tab.
  3. In the External Diff/Merge section, configure the settings as follows:
    • External Diff Tool - Select Custom.
    • Diff Command - Enter the path of the OxygendiffFile.exe file (for example: c:ProgramsOxygen XML Editor 19diffFiles.exe).
    • Arguments - Enter -ext $REMOTE $LOCAL $LOCAL.
    • Merge Tool - Select Custom.
    • Diff Command - Enter the path of the OxygendiffFile.exe file (for example: c:ProgramsOxygen XML Editor 19diffFiles.exe).
    • Arguments - Enter -ext $LOCAL $REMOTE $BASE $MERGED.
  4. Click OK.

Result: In Sourcetree, you can now compare file changes with the OxygenCompare Files tool by simply selecting External Diff from the contextual menu, Actions menu, or Ctrl+D.

Tool

Launch External Merge Tool Sourcetree

macOS
  1. In Sourcetree, go to Sourcetree > Preferences.
  2. Go to the Diff tab.
  3. In the External Diff/Merge section, configure the settings as follows:
    • External Diff Tool - Select Custom.
    • Diff Command - Enter a command-line argument to launch the OxygendiffFiles.sh file (for example: sh '/Applications/Oxygen XML Editor/diffFiles.sh').
    • Arguments - Enter -ext $REMOTE $LOCAL $LOCAL.
    • Merge Tool - Select Custom.
    • Diff Command - Enter a command-line argument to launch the OxygendiffFiles.sh file (for example: sh '/Applications/Oxygen XML Editor/diffFiles.sh').
    • Arguments - Enter -ext $LOCAL $REMOTE $BASE $MERGED.
  4. Close the preferences dialog box.

Launch External Merge Tool Sourcetree Mac

Result: In Sourcetree, you can now compare file changes with the OxygenCompare Files tool by simply selecting External Diff from the contextual menu or Actions menu.