Mercurial Repositories > eric / file diff

--- a/changelog	Sat Feb 03 18:37:36 2018 +0100
+++ b/changelog	Sat Feb 03 18:41:49 2018 +0100
@@ -4,6 +4,7 @@
 - bug fixes
 - Editor
   -- added support for EditorConfig
+  -- added VCS conflict markers to the types shown on the marker map
 
 Version 18.02:
 - bug fixes