- #MERGE TOOL P4MERGE HOW TO#
- #MERGE TOOL P4MERGE FULL#
It basically amounted to adding these lines to my. Of all the gui's I checked, KDiff3 proved to be the most transparent to use.īut I found the instructions I needed to get it working in Windows in this blog post, instructions which differ slightly from the other approaches listed here. I'm using Portable Git on WinXP (works a treat!), and needed to resolve a conflict that came up in branching.
Setting will not work anymore since Git has started trying to support p4merge, see libexec/git-core/git-mergetool-lib.so we just need to specify the mergetool path for git,for example the p4merge: git config -global 'C:\Program Files\Perforce\p4merge.exe'
$LOCALAPPDATA/Perforce/p4merge.exe), git does not seem to be expanding environment variables for paths (if you know how to get this working, please let me know or update this answer)
Even better would have been to take advantage of an environment variable (e.g. Although ~ should expand to current user's home directory (so in theory the path should be ~/AppData/Local/Perforce/p4merge.exe), this did not work for me. The above is an example path when p4merge was installed for the current user, not system-wide (does not need admin rights or UAC elevation). If it was listed as valid, you have to define in addition to merge.tool: git config -global c:/Users/my-login/AppData/Local/Perforce/p4merge.exe If p4merge was listed as available, it is in your PATH and you only have to set merge.tool: git config -global merge.tool p4merge You should see p4merge in either available or valid list. So you only need to modify your global git config (/.gitconfig):merge tool p4merge mergetool 'p4merge' path p4merge.exe diff tool p4merge difftool 'p4merge' path p4merge. You can display list of supported tools by running: git mergetool -tool-help A while ago this took more effort as described in this link (scroll to section ‘External Merge and Diff Tools’). note that by default Perforce will add its installation dir to PATH, thus no need to specify full path to p4merge in the commandĪs pointed out by Pakosz, latest msys git now "natively" supports p4merge (tested on 1.8.5.2.msysgit.0). 
added double quotes for all file names so that files with spaces can still be found by the merge tool (I tested this in msys Git from Powershell). the custom tool config value resides in "mergetool.cmd", not "merge.cmd" (silly me, spent an hour troubleshooting why git kept complaining about non-existing tool). valid for all git projects not just the current one The changes (relative to Charles Bailey): Or, from a windows cmd.exe shell, the second line becomes : git config -global "p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"" To follow-up on Charles Bailey's answer, here's my git setup that's using p4merge (free cross-platform 3way merge tool) tested on msys Git (Windows) install: git config -global merge.tool p4merge
0 kommentar(er)
