Subversion Integration

You can use abd as an external diff/merge tool in Subversion by adding small wrapper scripts.

1) Create Wrapper Scripts

Create ~/bin/svn-diff-abd:

#!/bin/sh
prev=""
last=""
for arg in "$@"; do
  prev="$last"
  last="$arg"
done
exec abd --local "$prev" --remote "$last"

Create ~/bin/svn-merge-abd:

#!/bin/sh
BASE="$1"
THEIRS="$2"
MINE="$3"
MERGED="$4"
exec abd --base "$BASE" --local "$MINE" --remote "$THEIRS" --result "$MERGED"

Make both executable:

chmod +x ~/bin/svn-diff-abd ~/bin/svn-merge-abd

Edit ~/.subversion/config:

[helpers]
diff-cmd = /Users/you/bin/svn-diff-abd
merge-tool-cmd = /Users/you/bin/svn-merge-abd

Diff: svn diff ...
Conflict resolution: interactive resolve and choose launch (l), or svn resolve --accept launch <path> on clients that support it.