- Download and install p4Merge (Helix P4Merge: Visual Merge Tool) from Perforce page
- Configure Git Extensions (Tools / Settings / Git Config) with the follow values (see image):
- Mergetool:
p4merge
- Path to mergetool:
C:/Program Files/Perforce/p4merge.exe
- Mergetool command:
"C:/Program Files/Perforce/p4merge.exe" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
- Difftool:
p4merge
- Path to difftool:
C:/Program Files/Perforce/p4merge.exe
- Mergetool:
- Difftool command:
"C:/Program Files/Perforce/p4merge.exe" "$LOCAL" "$REMOTE"