ABDiff Help

Git Integration

This assumes you already installed abd and you are familiar with the Git diff and merge workflow.

Configure for Merge

Run these once:

git config --global merge.tool abd
git config --global mergetool.abd.trustExitCode true
git config --global mergetool.abd.cmd 'abd --base "$BASE" --local "$LOCAL" --remote "$REMOTE" --result "$MERGED"'

Test it from a folder with file conflicts:

git mergetool

When invoked, ABDiff opens a window and waits until you close it. If you save the merged file before closing it Git will mark the conflict resolved.

When the MERGED file contains Git conflict markers, ABDiff hides them in the Result pane by replacing each conflict block with blank lines (one per line in the larger side). The file on disk is not changed until you save.

Configure for Diff

Run these once:

git config --global diff.tool abd
git config --global difftool.prompt false
git config --global difftool.abd.cmd 'abd --local "$LOCAL" --remote "$REMOTE"'

Test it:

git difftool

Git Access

ABDiff shows Git history when available, providing you explicitly grant access to their repository. This requires you to add the root folder of the project in the Settings > Folder Access list.

If there are several repositories under a common folder, you may want to add that common folder to the list as a way to grant permission on all those repositories. See Settings.

Reset Configuration

To stop using ABDiff run the following:

# reset merge tool
git config --global --unset-all merge.tool
git config --global --unset-all mergetool.abd.cmd
git config --global --unset-all mergetool.abd.trustExitCode

# reset diff tool
git config --global --unset-all diff.tool
git config --global --unset-all difftool.abd.cmd
git config --global --unset-all difftool.prompt

Related Topics