3

I would like to be able to edit conflicts using DiffMerge but when I try, VS (2010) complains I need to configure an external tool. It states I should do this from the Tools/Options/Source Control/Subversion menu. Trouble is, I don't have a [Source Control/Subversion], I have only [Plug-in Selection].

I found [this article] that indicates how to do the configuration but refers to the same menu entry...

Can anyone tell me what I need to install/configure to make this work?

ekkis
  • 9,804
  • 13
  • 55
  • 105

1 Answers1

3

First make sure you have AnkhSVN selected in Tools / Options / Source Control / Plug-in Selection. Then choose your diff tool in Tools / Options / Source Control / Subversion User tools. enter image description here

Suma
  • 33,181
  • 16
  • 123
  • 191
  • I cannot do as you suggest for the reason I explained: there is nothing under the Tools/Options/Source Control, except for [Plug-in Selection]. I seem to be missing the [Subversion] section everyone is talking about and I can't figure out why... – ekkis Jun 20 '11 at 07:37
  • What value do you see in the Plug-in Selection? – Suma Jun 20 '11 at 07:43
  • "AnkhSVN - Subversion support for Visual Studio" – ekkis Jun 21 '11 at 07:15
  • 1
    @Ekkis: I have added a screenshot. You should have the two Subversion entries under the Plug-in Selection on the left side. If you do not have them there, most likely your Ankh installation is broken and uninstalling and installing it again could help. – Suma Jun 21 '11 at 07:51
  • reinstalling solved the problem. I now see the sections in your screenshot and was able to configure my diff/merge tool. thanks a bunch! – ekkis Jun 23 '11 at 17:07