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

Resolve using theirs/mine broken in nightly build

From: Dave Lawrence <dlawrence_at_ad-holdings.co.uk>
Date: Wed, 20 Feb 2008 09:40:24 +0000


If "resolve using theirs" or "resolve using mine" are selected on a
conflicted file from the update dialog, nothing happens. If selected
from the check for modifications dialog, I get an "Invalid
'conflic_result' argument".

On this point, why are resolve using theirs and resolve using mine not
in the explorer context menu, but only hidden away in other dialog menus?

Build 12166


To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-02-20 10:41:00 CET

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

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