diff -r a7b096ecf963 -r d38b38117d83 QScintilla/EditorMarkerMap.py
--- a/QScintilla/EditorMarkerMap.py Sat Feb 03 18:37:36 2018 +0100
+++ b/QScintilla/EditorMarkerMap.py Sat Feb 03 18:41:49 2018 +0100
@@ -55,6 +55,8 @@
self.__currentLineMarker = Preferences.getEditorColour("CurrentMap")
self.__searchMarkerColor = Preferences.getEditorColour(
"SearchMarkersMap")
+ self.__vcsConflictMarkerColor = Preferences.getEditorColour(
+ "VcsConflictMarkersMap")
self.update()
def __drawIndicator(self, line, painter, color):
@@ -107,7 +109,11 @@
for line in self._master.getWarningLines():
self.__drawIndicator(line, painter, self.__warningColor)
- # 8. errors
+ # 8a. VCS conflict markers
+ for line in self._master.getVcsConflictMarkerLines():
+ self.__drawIndicator(line, painter, self.__vcsConflictMarkerColor)
+
+ # 8b. errors
for line in self._master.getSyntaxErrorLines():
self.__drawIndicator(line, painter, self.__errorColor)
