Sourcetree with p4merge how to#

These options are useful if you want to use ExamDiff Pro as an external merge tool.īelow you'll find examples of how to integrate ExamDiff Pro into some popular version control applications. Is your version control tool of choice not listed? Let us know and we can put up a tutorial for it. Using ExamDiff Pro as an External Merge Tool Note: '-' options can always be used instead of '/' options listed below, which can be helpful if Unix style file paths are passed. With several options that are helpful in a merge context: The syntax isĮxamDiff.exe /merge LeftFile CenterFile RightFile Starting with version 6.0, ExamDiff Pro's three-way diff and merge functionality allows it to be used as a merge tool in version control applications.

The /nh option, as usual, prevents the compared files from being added to ExamDiff Pro's history, which is handy because, since you're comparing temporary files, it wouldn't make sense to remember them. You can read more about this option here. The /dn1:name, /dn2:name, /dn3:name, and /dno:name set the display names of the left ('theirs'), center ('base'), right ('yours'), and output files, respectively.

They can be helpful if you don't want to see ugly temp file paths and your version control program sends file labels as parameters. Some of the examples below include instructions on how to use ExamDiff Pro as an external merge tool. UPDATE: Starting with Git 2.9 (Jun 10, 2016) ExamDiff Pro is an officially supported git mergetool, which means that you can just use the following command: Git/SourceTree Using ExamDiff Pro as an External Diff Tool Let us know if you would like us to put up a tutorial for your version control tool of choice.

Sourcetree with p4merge