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

Re: [TSVN] feature request, sort of

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-11-20 20:07:39 CET

Matthew Danish wrote:
> The menu option for "Resolved Conflicts" is very close to the menu
> option for "Edit Conflicts". As I was describing these to my
> co-worker, he accidentally clicked "Resolved" instead of "Edit".
> Clearly, there is a problem here, since it did not ask for
> confirmation nor does there seem to be a way to get back to the
> previous state where one could easily edit conflicts.

Done in revision 1947.

> The other request is for 3-way TMerge to permit the menu option "Use
> this text block" even on areas that aren't conflicted; just like the
> ordinary 2-way view allows.

Done in revision 1948.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Nov 20 20:08:12 2004

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.