Re: Regarding using KDiff3 merging tool

2016-08-26 Thread Yuri Chornoivan
п'ятниця, 26-сер-2016 18:14:15 ви написали: > Hi Yuri, > > Prashant (08/26): Thanks for the reply. But please answer the following: > > i.In Windows environment, Is there any way that I can > call Kdiff3 from command line + pass the choose_a_everywhere option in the > command

Re: Regarding using KDiff3 merging tool

2016-08-26 Thread Luigi Toscano
On Friday, 26 August 2016 18:14:15 CEST Prashant Pahurkar wrote: > Hi Yuri, > > Prashant (08/26): Thanks for the reply. But please answer the following: > > i.In Windows environment, Is there any way that I can > call Kdiff3 from command line + pass the choose_a_everywhere

Re: Regarding using KDiff3 merging tool

2016-08-26 Thread Prashant Pahurkar
Hi Yuri, Prashant (08/26): Thanks for the reply. But please answer the following: i.In Windows environment, Is there any way that I can call Kdiff3 from command line + pass the choose_a_everywhere option in the command line itself. Since such option is there in the front end

Re: Regarding using KDiff3 merging tool

2016-08-23 Thread Yuri Chornoivan
23 серпня 2016, 14:30:16, від "Prashant Pahurkar" : > Hi Yuri, > > > >   > > > > Thanks for your reply. > > > > I have few questions/clarification as below: > > > >   

Re: Regarding using KDiff3 merging tool

2016-08-23 Thread Prashant Pahurkar
Hi Yuri, Thanks for your reply. I have few questions/clarification as below: 1.*Yuri:-* Anyway, KDiff3 (as any other KDE application) can be controlled with D-Bus. See the instructive article here: http://www.linuxjournal.com/article/10455 You can easily found merge_choose_a_everywhere

Re: Regarding using KDiff3 merging tool

2016-08-12 Thread Yuri Chornoivan
Hi, Please find some answers below. написане Fri, 12 Aug 2016 09:39:32 +0300, Prashant Pahurkar : Gentle reminder. Please reply if it is possible to have the required functionality. Regards, Prashant On 11 Aug 2016 18:53, "Prashant Pahurkar"

Re: Regarding using KDiff3 merging tool

2016-08-12 Thread Prashant Pahurkar
Gentle reminder. Please reply if it is possible to have the required functionality. Regards, Prashant On 11 Aug 2016 18:53, "Prashant Pahurkar" wrote: > Gentle reminder. .. > Awaiting your reply. > > On 10 Aug 2016 16:46, "Prashant Pahurkar"

Re: Regarding using KDiff3 merging tool

2016-08-10 Thread Prashant Pahurkar
Hi Burkhard, Thanks for the reply. I have gone through the link you have shared but what I am looking out is somewhat different and is as follows: 1. I want to merge 2 files and auto resolve the conflict without any manunal intervention. Lets say I will provide the input as:- In Conflict

Re: Regarding using KDiff3 merging tool

2016-08-09 Thread Burkhard Lück
Am Dienstag, 9. August 2016, 18:21:02 CEST schrieb Prashant Pahurkar: > Hi, > > I have certain doubts and clarification required wrt using KDiff3 tool as > follows: > 1. I want to merge 2 files and auto resolve the conflict by adding first > lines from File A and then appending it with Lines from

Regarding using KDiff3 merging tool

2016-08-09 Thread Prashant Pahurkar
Hi, I have certain doubts and clarification required wrt using KDiff3 tool as follows: 1. I want to merge 2 files and auto resolve the conflict by adding first lines from File A and then appending it with Lines from B. Is it possible without manual intervention. 2. Also Can i achieve the same