Jump to content

andreas@initialforce.com

Members
  • Content Count

    2
  • Joined

  • Last visited

Community Reputation

0 Neutral

About andreas@initialforce.com

  • Rank
    Newbie

Profile Information

  • Gender
    Not Telling
  1. Thank you for the feedback, somehow I never got a notification on this, had to enable that manually in my profile. The typical file in question is .csproj XML files. It's fine that it falls back to text merge, I'm just still not able to use an external diff/merge tool for the job. I removed -lang=csharp option and that shows a different dialog when editing conflicts on .csproj files. If I shift+click text tool button, it still opens xmerge, but after closing xmerge I now get a new dialog saying an external merge tool was not configured. That's new and at least it tells me my configuration
  2. I am following this article: http://www.semanticmerge.com/sm-guides/main.shtml#Launchoptionsconfigurationfile I want to be able to launch an external text diff/merge tool for certain cases that Semantic Merge can't handle smart. I think I saw in one of the change logs that an external text tool can be launched by holding the shift key? When pressing the text diff button? It didn't seem to work. I don't want to override the text diff tool in general, just for particular cases where I know other tools work better. Example: Whenever I edit a merge for an XML file, it tells me it can't pa
×
×
  • Create New...