Hi Sourcetree team,

I’m Andy, the developer of Riffle, a native macOS diff and merge app. A Riffle user recently asked about integrating it with Sourcetree, and I’d like to request a built-in Riffle option under Settings → Diff → External Diff / Merge.

The current route is to select Custom and enter the executable and arguments manually. I’ve been testing external diffs from Sourcetree against Riffle’s latest development build. A preset would reduce setup mistakes and make the integration easier to find.

App identification:

• Name: Riffle
• Bundle identifier: dev.skulkworks.riffle
• Platform: macOS 14 or later, Apple silicon and Intel
• Bundled launcher: Contents/SharedSupport/bin/riffle inside Riffle.app

Command mappings:

• Diff arguments: `--wait "$LOCAL" "$REMOTE"`
• Merge arguments: `--merge --output "$MERGED" --base "$BASE" – "$LOCAL" "$REMOTE"`

The diff command waits until the comparison closes. Merge mode waits and returns 0 after saving or 1 if abandoned. For detection, locating the app by bundle identifier and calling its bundled launcher would avoid requiring a separately installed CLI symlink.

Product: https://skulkworks.dev/riffle

Integration instructions: https://skulkworks.dev/riffle/integrations

Two-way file diff is free; merge and folder comparison use a one-time license. I’m happy to supply any additional adapter details or help test the integration.

Thanks,
Andy Miller
Skulkworks