Version 1.02

FIX: Avoid E417 / E421 in conflict marker highlight group definitions when no original color is defined (i.e. when the colorscheme does not define a cterm / gui background color for DiffAdd/Change/Text). Thanks to Dave Goodell for sending a patch.
Version 1.10

ENH: Add :ConflictSyntax command to work around interference of the conflict highlightings with the original filetype's syntax.
Version 1.11: FIX: Prevent error on Vim 7.0 - 7.2.
Version 1.12

- To avoid false positives (e.g. in nested email replies), ensure that both "our" and "theirs" markers do exist.
- Add dependency to ingo-library (vimscript #4433) *** DOWNLOAD AND INSTALL SEPARATELY ***