Under what conditions will the Visual Studio 2012 Difference Viewer allowing editing a source file

Question

Rather than continuing with Winmerge as my tool of choice, I\'ve decided to commit to using the Difference Viewer built into Visual Studio 2012 Premium especially given it u

Answer 1

If you click the Merge button instead of Compare Files, you get a slightly different diff window that lets you edit the local file. Also see the edit in the answer about aspx files.

Answer 2

You can only edit certain file types in the Diff viewer. Example: You can edit .cs, but not .sql files.