Jetbrains

Merge

Open the configuration with ⌘, then go to Tools ▸ Diff & Merge ▸ External Diff Tools

• Enable external tools

• Press (+)

• Fill-in the following information in Add An External Tool

  • Tool group: Merge tool
  • Program path: /path/to/abd
  • Tool name: ABDiff
  • Argument pattern: --base %3 --local %1 --remote %2 --result %4
  • Trust process exit code
  • Press “Test Merge” to see if the merge completes.
  • Press OK

Diff

• Press (+)
• Fill-in the following information in Add An External Tool
  • Tool group: Diff tool
  • Program path: /path/to/abd
  • Tool name: ABDiff
  • Argument pattern: --local %1 --remote %2
  • Press “Test Diff” to see if the diff completes.
  • Press OK

Sourcetree

Open the configuration with ⌘, then set

• Merge Tool: Custom…
• Merge Command: /path/to/abd
• Arguments: --base "$BASE" --local "$LOCAL" --remote "$REMOTE" --result "$MERGED"

Visual Code

Install the ABDiff extension for VSCode from https://github.com/janodev/vscode-abd.

Here are other ways to solve merge conflicts in Visual Code for comparison:

• Launch the VSCode conflict editor selecting a conflict and pressing Resolve in Merge Editor.
• Launch the configured Git tool by running git mergetool from the internal VSCode terminal.