[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 3 Jul 2017 21:38:03 +0200

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
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3256203
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-07-03 21:38:16 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.