Scribd
Upload
110 views1 page

Visual Diff and Merge Tool Install and Configure: Windows: P4Merge For Windows

This document provides instructions for installing and configuring the visual diff and merge tool P4Merge on Windows and Mac OS X systems for use with Git. It lists the commands needed to set P4Merge as the default diff and merge tools in Git and configure the file paths. Settings are also added to the ~/.gitconfig file to codify the selections.

Uploaded by

Harsh Gupta
Copyright
© © All Rights Reserved
We take content rights seriously. If you suspect this is your content, claim it here.
Available Formats
Download as PDF, TXT or read online on Scribd
110 views1 page

Visual Diff and Merge Tool Install and Configure: Windows: P4Merge For Windows

This document provides instructions for installing and configuring the visual diff and merge tool P4Merge on Windows and Mac OS X systems for use with Git. It lists the commands needed to set P4Merge as the default diff and merge tools in Git and configure the file paths. Settings are also added to the ~/.gitconfig file to codify the selections.

Uploaded by

Harsh Gupta
Copyright
© © All Rights Reserved
We take content rights seriously. If you suspect this is your content, claim it here.
Available Formats
Download as PDF, TXT or read online on Scribd
You are on page 1/ 1

Visual Diff and Merge Tool Install and Configure

Windows: P4Merge for Windows


P4Merge on Windows is an excellent choice for a free visual merge tool.

Command Listing

git config --global merge.tool p4merge


git config --global mergetool.p4merge.path "C:/Program Files/Perforce/p4merge.exe"
git config --global diff.tool p4merge
git config --global difftool.p4merge.path "C:/Program Files/Perforce/p4merge.exe"
git config --global difftool.prompt false
git config --global mergetool.prompt false

~/.gitconfig File (snip)

[merge]
tool = p4merge
[mergetool "p4merge"]
path = C:/Program Files/Perforce/p4merge.exe
[diff]
tool = p4merge
[difftool "p4merge"]
path = C:/Program Files/Perforce/p4merge.exe
[difftool]
prompt = false
[mergetool]
prompt = false

Mac OS X: P4Merge for Mac


P4Merge on the Mac is an excellent choice for a free visual merge tool.

Command Listing

git config --global mergetool.p4merge.path /Applications/p4merge.app/Contents/MacOS/p4merge


git config --global merge.tool p4merge
git config --global difftool.p4merge.path /Applications/p4merge.app/Contents/MacOS/p4merge
git config --global diff.tool p4merge
git config --global difftool.prompt false
git config --global mergetool.prompt false

~/.gitconfig File (snip)

[diff]
tool = p4merge
[merge]
tool = p4merge
[difftool "p4merge"]
path = /Applications/p4merge.app/Contents/MacOS/p4merge
[mergetool "p4merge"]
path = /Applications/p4merge.app/Contents/MacOS/p4merge
[difftool]
prompt = false
[mergetool]
prompt = false

You might also like