diff src/historywidget.cpp @ 505:1c05e7576ea5

Fix bug #292: "Merge that results in no changes leaves interface in inconsistent state." Show uncommitted state whenever a merge is present, even if no file changes
author Chris Cannam
date Mon, 17 Oct 2011 16:25:02 +0100
parents 61bde1f0ff0a
children 470829a21f98
line wrap: on
line diff
--- a/src/historywidget.cpp	Thu Sep 15 14:51:39 2011 +0100
+++ b/src/historywidget.cpp	Mon Oct 17 16:25:02 2011 +0100
@@ -86,6 +86,11 @@
 
     m_refreshNeeded = true;
 }
+
+void HistoryWidget::setShowUncommitted(bool showUncommitted)
+{
+    setCurrent(m_currentIds, m_currentBranch, showUncommitted);
+}
     
 void HistoryWidget::parseNewLog(QString log)
 {