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
Closed

Support of AraxisMerge merge tool #74

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

Comments

@elendil-software
Copy link

@elendil-software elendil-software 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 added this to the 1.33 milestone May 13, 2019
@DanPristupov DanPristupov removed this from the 1.33 milestone May 16, 2019
@DanPristupov DanPristupov added this to the 1.34 milestone May 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
2 participants