Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.
Already on GitHub?
to your account
The current version of Fork support natively only two merge/diff tools.
Here are the parameters for AraxisMerge if you want to add more:
Merger path: C:/Program Files/Araxis/Araxis Merge/compare.exe
Arguments (merge tool): -wait -merge -3 "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
Arguments (diff tool): "$LOCAL" "$REMOTE"
C:/Program Files/Araxis/Araxis Merge/compare.exe
-wait -merge -3 "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
The text was updated successfully, but these errors were encountered:
Successfully merging a pull request may close this issue.