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

Adapt the way to read the external diff tool configuration in .gitconfig #32

Closed
laurentkempe opened this issue Aug 21, 2014 · 1 comment
Closed

Adapt the way to read the external diff tool configuration in .gitconfig #32

laurentkempe opened this issue Aug 21, 2014 · 1 comment
Assignees
@laurentkempe
Labels
bug feature
Milestone
2.0.0

Comments

@laurentkempe
Copy link
Owner

With Semantic merge

[diff]
tool = semanticdiff

[difftool "semanticdiff"]
cmd = C:/Users/Laurent/AppData/Local/PlasticSCM4/semanticmerge/semanticmergetool.exe -s "$LOCAL" -d "$REMOTE"

[difftool]
prompt = false

With p4merge

[difftool "p4merge"]
path = C:/Program Files/Perforce/p4merge.exe
cmd = "C:/Program Files/Perforce/p4merge.exe" "$LOCAL" "$REMOTE"
[diff]
guitool = p4merge
@laurentkempe laurentkempe added this to the 2.0.0 milestone Aug 21, 2014
@laurentkempe laurentkempe self-assigned this Aug 21, 2014
@laurentkempe
Copy link
Owner Author

[diff]
guitool = p4merge

is not valid according to git documentation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@laurentkempe laurentkempe

Labels
bug feature
Projects
None yet
Milestone
2.0.0
Development

No branches or pull requests
1 participant
@laurentkempe