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

Edit Conflict greyed-out

From: Lori Howland <lori.howland_at_sixsigmasystems.com>
Date: Mon, 22 Mar 2010 11:34:03 -0700 (PDT)

New to Tortoise, but have logged exp w/src control.

The Merge Conflict CallbackDialog
shows the Edit Conflict option

Tortoise guru at my company says he's never seen this before.

I know TortoiseMerge is installed, b/c it launches from "Show Differences"

Is there a simple explanation for why I cannot edit a conflict?

Thank you for any help you can give me!

Received on 2010-03-22 19:36:51 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.