Skip to content

Instantly share code, notes, and snippets.

@smac89 smac89/.gitconfig
Last active Jun 21, 2017

Embed
What would you like to do?
Gitconfig settings to use p4merge on windows using Cygwin terminal
[merge]
tool = p4merge
[mergetool "p4merge"]
path = "C:/PROGRA~1/Perforce/p4merge.exe"
[mergetool]
keepBackup = false
trustExitcode = false
[diff]
tool = p4merge
[difftool "p4merge"]
cmd = "C:/PROGRA~1/Perforce/p4merge.exe `cygpath -asm $LOCAL` `cygpath -asm $REMOTE`"
[difftool]
prompt = false
@smac89

This comment has been minimized.

Copy link
Owner Author

smac89 commented Apr 26, 2016

You can create the short name for the location of p4merge by running the following command from cygwin terminal:
cygpath.exe -asm /cygdrive/c/Program\ Files/Perforce/p4merge.exe

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