How to Integrate WinMerge

ddd · Post by **ddd** » Tue Feb 14, 2006 12:58 am

How do switch to use WinMerge (for diff) over the one that comes with the package?

lbauer · Post by **lbauer** » Tue Feb 14, 2006 8:07 am

You can change the merge tool used with Vault. See Tools->Options->Diff/Merge in the Vault GUI Client.

mlippert · Post by **mlippert** » Tue Feb 14, 2006 10:53 am

Linda,
This raises a question I've been wondering about. Changing the merge tool in the options doesn't change what the Merge Branches Wizard uses for automatic merging does it?

And actually, does it change what Vault uses when it needs to do an automatic merge during a Get Latest Version (when Attempt Automatic Merge is checked)?

My guess is that automatic merge always uses the SourceGear merge, and that changing the option only affects the manual merge (the tool invoked by the Show Merge menu option).

Mike

dan · Post by **dan** » Tue Feb 14, 2006 1:14 pm

That is correct Mike - this option only applies to the external merge app that is launched. The Merge Branches wizard and the merge on a Get Latest always use the internal one.