<div dir="ltr">Worked like a charm, thanks.</div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Apr 25, 2016 at 7:13 AM, Oxygen XML Editor Support (Octavian Nadolu) <span dir="ltr"><<a href="mailto:support@oxygenxml.com" target="_blank">support@oxygenxml.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hello,<br>
<br>
The shell scripts for Mac are not updated. I added an issue to fix this an an oXygen XML Editor 18.0 maintenance build.<br>
<br>
Until we fix the problem you can change the "diffFilesMac.sh" script from the oXygen installation directory by adding a new parameter. The last line from the script must be:<br>
ro.sync.exml.Oxygen "$1" "$2" "$3"<br>
instead of:<br>
ro.sync.exml.Oxygen "$1" "$2"<br>
<br>
Thank you for reporting this issue.<br>
<br>
Best Regards,<br>
Octavian<span class=""><br>
<br>
On <a href="tel:22.04.2016%2018" value="+12204201618" target="_blank">22.04.2016 18</a>:38, Steven Anderson wrote:<br>
</span><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">
I tried that, on a Mac, with the shell script, and only got the 2 way<br>
merge. Sorry, I should have mentioned that.<br>
<br>
On Apr 21, 2016, at 11:01 PM, Octavian Nadolu <<a href="mailto:octavian_nadolu@sync.ro" target="_blank">octavian_nadolu@sync.ro</a><br></span>
<mailto:<a href="mailto:octavian_nadolu@sync.ro" target="_blank">octavian_nadolu@sync.ro</a>>> wrote:<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="h5">
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<br>
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<br>
specified the Diff Files will start in two-way comparison mode. If is<br>
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.<br>
If you will select 3 files from the Project view and use the Compare<br>
action from the contextual menu the Diff Files will start in three-way<br>
mode. Your first selection will be opened in the left panel, the<br>
second in the right panel, and the third selection will be the base<br>
(ancestor) file.<br>
<br>
Best Regards,<br>
Octavian<br>
--<br>
Octavian Nadolu<br>
<oXygen/> XML Editor<br>
<a href="http://www.oxygenxml.com" rel="noreferrer" target="_blank">http://www.oxygenxml.com</a><br>
<br>
<br>
<br>
On <a href="tel:22.04.2016%2002" value="+12204201602" target="_blank">22.04.2016 02</a>:34, Steven Anderson wrote:<br>
</div></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="h5">
I am so, so, so excited for the three way diff/merge tool, but I<br>
can't figure out how to start it from the command-line.<br></div></div>
�/Please/�tell me it's possible or you're going to make a grown<span class=""><br>
man cry.<br>
<br>
--<br>
<br>
� � �Steve<br>
<br>
<br>
_______________________________________________<br>
oXygen-user mailing list<br>
<a href="mailto:oXygen-user@oxygenxml.com" target="_blank">oXygen-user@oxygenxml.com</a><br>
<a href="https://www.oxygenxml.com/mailman/listinfo/oxygen-user" rel="noreferrer" target="_blank">https://www.oxygenxml.com/mailman/listinfo/oxygen-user</a><br>
</span></blockquote>
<br>
_______________________________________________<br>
oXygen-user mailing list<br>
<a href="mailto:oXygen-user@oxygenxml.com" target="_blank">oXygen-user@oxygenxml.com</a> <mailto:<a href="mailto:oXygen-user@oxygenxml.com" target="_blank">oXygen-user@oxygenxml.com</a>><br>
<a href="https://www.oxygenxml.com/mailman/listinfo/oxygen-user" rel="noreferrer" target="_blank">https://www.oxygenxml.com/mailman/listinfo/oxygen-user</a><br>
</blockquote><span class="">
<br>
<br>
_______________________________________________<br>
oXygen-user mailing list<br>
<a href="mailto:oXygen-user@oxygenxml.com" target="_blank">oXygen-user@oxygenxml.com</a><br>
<a href="https://www.oxygenxml.com/mailman/listinfo/oxygen-user" rel="noreferrer" target="_blank">https://www.oxygenxml.com/mailman/listinfo/oxygen-user</a><br>
<br>
</span></blockquote><div class="HOEnZb"><div class="h5">
<br>
_______________________________________________<br>
oXygen-user mailing list<br>
<a href="mailto:oXygen-user@oxygenxml.com" target="_blank">oXygen-user@oxygenxml.com</a><br>
<a href="https://www.oxygenxml.com/mailman/listinfo/oxygen-user" rel="noreferrer" target="_blank">https://www.oxygenxml.com/mailman/listinfo/oxygen-user</a><br>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr"><br><div> Steve<br></div></div></div>
</div>