Skip to content
New issue

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

Support of AraxisMerge merge tool #74

Closed
elendil-software opened this issue Dec 10, 2018 · 0 comments

Comments

@elendil-software
Copy link

commented Dec 10, 2018

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

@DanPristupov DanPristupov modified the milestones: 1.33, 1.34 May 13, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.