Margin doesn't appear for .html files

[RandScullard]

The GitDiffMargin doesn't appear for .html files, unless you use Open With... and choose "Source Code (Text) Editor". It seems as if it isn't registering itself with the default editor, "HTML Editor".

[laurentkempe]

Thanks for the report. It might be because GitDiffMargin is registered with the Source Code Editor and that the HTML Editor is a different one. I will have a look at it.

[RandScullard]

Just to clarify: I'm using the regular HTML Editor, not the HTML Designer.

[RandScullard]

I am using the Git Source Control Provider extension for Visual Studio, and it includes a version of GitDiffMargin. I would like to upgrade to your latest version of GitDiffMargin that includes this fix, but if both extensions are installed, I get an error. Is there a way to have these two extensions coexist, or somehow remove GitDiffMargin from Git Source Control Provider?

[laurentkempe]

@RandScullard in fact GitDiffMargin was ported to Git Source Control Provider and improved by @sharwell
I discussed about that issue with Sam over the weekend so he is aware of the issue. I have no clue when he will come with a fix about that issue in Git Source Control Provider.
I never tried to run both at the same time, could describe a bit more the issue that you get please.
Thanks

[RandScullard]

I emailed you the ActivityLog.xml that Visual Studio 2012 created when I tried to run both at the same time. I believe the key entries are:

652 2013/10/21 13:04:10.787 Error Editor or Editor Extension System.ComponentModel.Composition.ImportCardinalityMismatchException: Duplicate EditorFormatDefinition exports with identical name attributes exist. Duplicate name is GITDIFFADDITION 653 2013/10/21 13:04:10.787 Error Editor or Editor Extension System.ComponentModel.Composition.ImportCardinalityMismatchException: Duplicate EditorFormatDefinition exports with identical name attributes exist. Duplicate name is GITDIFFMODIFICATION 654 2013/10/21 13:04:10.787 Error Editor or Editor Extension System.ComponentModel.Composition.ImportCardinalityMismatchException: Duplicate EditorFormatDefinition exports with identical name attributes exist. Duplicate name is GITDIFFREMOVED