<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<div class="moz-cite-prefix">Hello,<br>
<br>
To start the diff from command line you need to run the following
command:<br>
diffFiles.exe or diffFiles.bat [path to left file] [path to right
file] [path to ancestor file]<br>
<br>
[path to left file] - will be added in the left panel<br>
[path to right file] - will be added in the right panel<br>
[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.<br>
<br>
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.<br>
<br>
Best Regards,<br>
Octavian<br>
<pre class="moz-signature" cols="72">--
Octavian Nadolu
<oXygen/> XML Editor
<a class="moz-txt-link-freetext" href="http://www.oxygenxml.com">http://www.oxygenxml.com</a></pre>
<br>
<br>
<br>
On 22.04.2016 02:34, Steven Anderson wrote:<br>
</div>
<blockquote
cite="mid:CA+_fDk6DZF56T0Z1_hEXALFDieWn0ABP8xZ--3dLdH8LQB9Ayw@mail.gmail.com"
type="cite">
<div dir="ltr">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. <i>Please</i> tell me it's possible or you're
going to make a grown man cry.<br clear="all">
<div><br>
</div>
-- <br>
<div class="gmail_signature">
<div dir="ltr"><br>
<div> Steve<br>
</div>
</div>
</div>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
oXygen-user mailing list
<a class="moz-txt-link-abbreviated" href="mailto:oXygen-user@oxygenxml.com">oXygen-user@oxygenxml.com</a>
<a class="moz-txt-link-freetext" href="https://www.oxygenxml.com/mailman/listinfo/oxygen-user">https://www.oxygenxml.com/mailman/listinfo/oxygen-user</a>
</pre>
</blockquote>
<br>
</body>
</html>