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.

Sign up for GitHub

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

Jump to bottom

Other merge tools #2

Open
FDiskas opened this issue Mar 18, 2021 · 0 comments
Open

Other merge tools #2

FDiskas opened this issue Mar 18, 2021 · 0 comments

Comments

@FDiskas
Copy link

FDiskas commented Mar 18, 2021

Is it possible to integrate other tools ex p4merge or meld?:

git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd p4merge '$BASE $LOCAL $REMOTE $MERGED'
git config --global mergetool.p4merge.trustExitCode false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@FDiskas