Login | Register
My pages Projects Community openCollabNet

Discussions > dev > Re: Feature request: Allow to open Diff Base:Mine and Base:Theirs from conflict resolution

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

Re: Feature request: Allow to open Diff Base:Mine and Base:Theirs from conflict resolution

Author steveking
Full name Stefan Küng
Date 2017-07-03 12:38:12 PDT
Message On 03.07.2017 10:58, Sven Strickroth wrote:
> Hi,
>
> sometimes the 3-way-diff mode is quite complex and not easy to read.
>
> What about adding an option to open the Base:Mine and Base:Theirs diffs separately (e.g., by opening the context menu on the header bar).

Not sure what you mean here:
Am I understanding this correctly that you want a button/menu-entry to
open a separate TMerge instance which would then show the diff between
base/min or base/theirs?
You're aware that editing would have to be blocked in those instances?
Or how would you use edits in those instances?
Not sure how this would work...

Stefan

--
        ___
   oo // \\ "De Chelonian Mobile"
  (_,\/ \_/ \ TortoiseSVN
    \ \_/_\_/> The coolest interface to (Sub)version control
    /_/ \_\ http://tortoisesvn.net

« Previous message in topic | 2 of 3 | Next message in topic »

Messages

Show all messages in topic

Feature request: Allow to open Diff Base:Mine and Base:Theirs from conflict resolution mr_tux Sven Strickroth 2017-07-03 01:58:46 PDT
     Re: Feature request: Allow to open Diff Base:Mine and Base:Theirs from conflict resolution steveking Stefan Küng 2017-07-03 12:38:12 PDT
         Re: Feature request: Allow to open Diff Base:Mine and Base:Theirs from conflict resolution Stefan Hett <stefan at egosoft dot com> Stefan Hett <stefan at egosoft dot com> 2017-08-21 10:54:48 PDT
Messages per page: