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

Re: [TSVN] Couple of issues with Resolve action

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-01-03 18:16:24 CET

Will Dean <svn@indcomp.co.uk> wrote on 01/03/2005 12:04:13 PM:

> At 12:00 03/01/2005 -0500, you wrote:
>
> >2) I am working on a long lived branch and do frequent merges from
trunk.
> > I love that I can double-click on conflicts and launch TMerge. It
would
> >be equally wonderful if somehow you could mark the conflict resolved
from
> >within TMerge, when exiting TMerge, or perhaps a right-click option on
the
> >main merge confirmation dialog that I used to launch TMerge.
>
> There is already an option in TMerge to do this.

Thanks, I will look for it next time I get a chance.

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jan 3 18:18:15 2005

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