We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
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? Sign in to your account
Hi,
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"
"$LOCAL" "$REMOTE"
Regards
Julien
The text was updated successfully, but these errors were encountered:
No branches or pull requests
Hi,
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"
Regards
Julien
The text was updated successfully, but these errors were encountered: