marijnh/CodeMirror — pull request #1765 by ciaranj (2013-08-21 21:18:34+00:00)
Title: [merge addon] Add highlightDifferences option and method

*Note, I'm not expecting this changeset as it currently stands to be the best approach, for example I suspect line 60 is very odd, but it 'works' (I suspect at quite a great performance cost) and I was going to apply the same 'options' based approach used in the core CodeMirror object, but was put off as I'd basically have to copy'n'paste the same code verbatim, the contribution guidelines that I skimmed did not appear to suggest how one should properly do options in this sort of scenario :/ (sorry)*

Provides new option (highlightDifferences) and method highlightDifferences(bool)
to the MergeView plugin.

If true (or undefined) the original behaviour is maintained, which is to show
the differences (line highlighting and gutter graphics), if false then
the changes will not be shown.

Calling the method causes the visual change to occur 'immediately'

Signed-off-by: ciaranj