#
#
# patch "src/model/ContentDiff.cpp"
#  from [e0802384fee41ec12380d12008411f45647b0670]
#    to [74852b2ba64c28376d51ada0f718228ba4612d5f]
# 
# patch "src/view/ColorPicker.cpp"
#  from [4c497c2bffb4198c0bc2304830d6290f6eb16e0b]
#    to [b88a44ef984ea3c150ad2032800e76e62e397f01]
#
============================================================
--- src/model/ContentDiff.cpp	e0802384fee41ec12380d12008411f45647b0670
+++ src/model/ContentDiff.cpp	74852b2ba64c28376d51ada0f718228ba4612d5f
@@ -229,13 +229,13 @@ QVariant ContentDiff::data(const QModelI
     {
         if (line->type != ListLine::HunkLine) return QVariant();
 
-        if (line->lineMarker.startsWith("-"))
+        if (line->lineMarker.startsWith("+"))
         {
             QColor added(Settings::getString("DiffColorAddedLines", "green"));
             return QVariant(QBrush(added));
         }
 
-        if (line->lineMarker.startsWith("+"))
+        if (line->lineMarker.startsWith("-"))
         {
             QColor removed(Settings::getString("DiffColorRemovedLines", "red"));
             return QVariant(QBrush(removed));
============================================================
--- src/view/ColorPicker.cpp	4c497c2bffb4198c0bc2304830d6290f6eb16e0b
+++ src/view/ColorPicker.cpp	b88a44ef984ea3c150ad2032800e76e62e397f01
@@ -46,6 +46,6 @@ void ColorPicker::mousePressEvent(QMouse
 void ColorPicker::mousePressEvent(QMouseEvent * ev)
 {
     Q_UNUSED(ev);
-    setSelectedColor(QColorDialog::getColor(selectedColor, this));
+    setSelectedColor(QColorDialog::getColor(selectedColor, NULL));
 }