Weird Command Line Passed to Merge Tool

Go To Last Post
2 posts / 0 new
Author
Message
#1
  • 1
  • 2
  • 3
  • 4
  • 5
Total votes: 0

Just getting started with using Atmel Start integration with Atmel Studio.  But I have an issue with the merging of code when generating the Atmel Start Project.

 

I had Tools->Options->Atmel Start->File Compare setup with WinMerge using the exact syntax from the suggested text in that dialog.  However, I noticed that I could only merge left (merge right was greyed out).

 

Not sure what to think, I installed KIDFF3 (which I'm more familiar with) and just entered the basic command line startup "%original   %mine" with no extra switches.  When the window came up there was a third column in the merge named "C:\wr".  What is that?  It seems that Atmel Studio is sending something like "/Cwr" at the end of the command line.

 

That also explains why I can't merge right for WinMerge because "/wr" means the right-side is read only.

 

How do I get Atmel Studio to stop sending that bit at the end of the command line?

 

Atmel Studio 7.0.2397

 

James.

  • 1
  • 2
  • 3
  • 4
  • 5
Total votes: 0

Just a followup:

 

Using WinMerge and the default arguments, once I'm in WinMerge I can select File->Read-Only and click on "Right Read-Only" (it was checked) to make it writable.  Then I can select Merge Right option and things proceed as expected.

 

WinMerge version 2.16.4.0

 

So I have a work around for now but it seems like something is not right here with Atmel Studio.