Hello,

To start the diff from command line you need to run the following command:
diffFiles.exe or diffFiles.bat [path to left file] [path to right file] [path to ancestor file]

[path to left file] - will be added in the left panel
[path to right file] - will be added in the right panel
[path to ancestor file] - will be the base (ancestor) file. If is not specified the Diff Files will start in two-way comparison mode. If is specified the Diff Files will start in three-way comparison mode.

You can also start the diff from the oXygen XML Editor Project view. If you will select 3 files from the Project view and use the Compare action from the contextual menu the Diff Files will start in three-way mode. Your first selection will be opened in the left panel, the second in the right panel, and the third selection will be the base (ancestor) file.

Best Regards,
Octavian

-- 
Octavian Nadolu
<oXygen/> XML Editor
http://www.oxygenxml.com

On 22.04.2016 02:34, Steven Anderson wrote:

I am so, so, so excited for the three way diff/merge tool, but I can't figure out how to start it from the command-line. Please tell me it's possible or you're going to make a grown man cry.

--

Steve
_______________________________________________
oXygen-user mailing list
oXygen-user@oxygenxml.com
https://www.oxygenxml.com/mailman/listinfo/oxygen-user