JuxtaCode
All integrations

Integrate with Fork

Make JuxtaCode the external diff and merge tool for Fork.

Required setup

Install the juxta command

Choose the instructions for your version of JuxtaCode.

Direct version

In JuxtaCode, choose JuxtaCode → Command Line Tool…, then select Install….

App Store version

Download the juxta installer and run the package.

Command-line guide

In Fork, go to Settings → Integration and set both Merge Tool and External Diff Tool to Custom.

Fork integration settings with custom merge and external diff tools.

For each setting, select Edit… and enter the following values.

Merge tool

  • File path: /usr/local/bin/juxta
  • Arguments: _mergetool --base $BASE --local $LOCAL --remote $REMOTE --merged $MERGED

External diff tool

  • File path: /usr/local/bin/juxta
  • Arguments: compare $LOCAL $REMOTE