Perforce Diff and Merge Integration
To configure P4V (2007.2 release or later) to use Guiffy for file diff and merges:
Choose Preferences from the Edit menu.
To set Guiffy as the diff tool:
- Switch to the Diff tab.
- Change the Default Diff Application option to "Other application".
- For the "Location", "Browse" and select the Guiffy application file in the Guiffy installation folder.
To set Guiffy as the merge tool:
- Switch to the Merge tab.
- Change the Default Merge Application option to "Other application".
- For the "Location", "Browse" and select the Guiffy application file in the Guiffy installation folder.
- In the "Arguments" edit, enter:
-s %1 %2 %b %r
NOTE:
On Windows the Guiffy application file is guiffy.exe.
On Linux the Guiffy application file is guiffy.
On MacOS the Guiffy application file is guiffy.
Documentation by
Guiffy Software, Inc. 2023