Minor Updates to Using Perforce merge tool with TFS
Update
the instructions for setting up P4 to work with TFS Merge are a little more difficult and best explained here, this works with 2010 as well
So it took me only one day to see that I had been blind, and I switched over to Perforce’s merge tool as my default Diff tool in TFS on all my dev machines (as detailed here ).
However, diff wasn’t enough I wanted the Merge Capabilities of Perforce Merge as well, that’s a slightly different command.
and in looking up the right way to call Perforce Merge as a Merge tool, I saw right away that for merge capabilities it requires %2 to come before %1.
Yesterday’s post detailing how to set up Compare had %1 then %2. While for Diff purposes this would work fine, that means that you would have a difference between Diff and Merge in the presentation of your source and target files. So just to be OCD, I updated the compare operation to also put the Local version before the Server version in the perforce display.
Thanks to the following links for helping me to figure this out.
Installing and Using P4Merge in Git for Windows
diff/merge configuration in Team Foundation - common Command and Argument values