[oXygen-user] 3 way diff/merge not possible from the command line?

[Steven Anderson]

Worked like a charm, thanks.

On Mon, Apr 25, 2016 at 7:13 AM, Oxygen XML Editor Support (Octavian
Nadolu) <> wrote:

> Hello,
>
> The shell scripts for Mac are not updated. I added an issue to fix this an
> an oXygen XML Editor 18.0 maintenance build.
>
> 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:
>  ro.sync.exml.Oxygen "$1" "$2" "$3"
> instead of:
>  ro.sync.exml.Oxygen "$1" "$2"
>
> Thank you for reporting this issue.
>
> Best Regards,
> Octavian
>
> On 22.04.2016 18:38, Steven Anderson wrote:
>
>> I tried that, on a Mac, with the shell script, and only got the 2 way
>> merge.  Sorry, I should have mentioned that.
>>
>> On Apr 21, 2016, at 11:01 PM, Octavian Nadolu <
>> <mailto:>> wrote:
>>
>> 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
>>>> 
>>>> https://www.oxygenxml.com/mailman/listinfo/oxygen-user
>>>>
>>>
>>> _______________________________________________
>>> oXygen-user mailing list
>>>  <mailto:>
>>> https://www.oxygenxml.com/mailman/listinfo/oxygen-user
>>>
>>
>>
>> _______________________________________________
>> oXygen-user mailing list
>> 
>> https://www.oxygenxml.com/mailman/listinfo/oxygen-user
>>
>>
> _______________________________________________
> oXygen-user mailing list
> 
> https://www.oxygenxml.com/mailman/listinfo/oxygen-user
>



-- 

     Steve
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.oxygenxml.com/pipermail/oxygen-user/attachments/20160429/296a236e/attachment.html>