Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/EditorStylesPage.ui	Sat Feb 03 18:37:36 2018 +0100
+++ b/Preferences/ConfigurationPages/EditorStylesPage.ui	Sat Feb 03 18:41:49 2018 +0100
@@ -1828,6 +1828,29 @@
         </property>
        </widget>
       </item>
+      <item row="4" column="2">
+       <widget class="QLabel" name="label_16">
+        <property name="text">
+         <string>Conflict Marker Line:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="3">
+       <widget class="QPushButton" name="conflictMarkerMapButton">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Select the colour for the conflict marker line marker</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
       <item row="5" column="0">
        <widget class="QLabel" name="label_14">
         <property name="text">
@@ -1967,6 +1990,7 @@
   <tabstop>coverageMapButton</tabstop>
   <tabstop>currentMapButton</tabstop>
   <tabstop>searchMarkerMapButton</tabstop>
+  <tabstop>conflictMarkerMapButton</tabstop>
   <tabstop>markerMapBackgroundButton</tabstop>
   <tabstop>miniMenuCheckBox</tabstop>
   <tabstop>hideFormatButtonsCheckBox</tabstop>