Mercurial > hg > easyhg
diff src/historywidget.h @ 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 | b9c153e00e84 |
children | 470829a21f98 |
line wrap: on
line diff
--- a/src/historywidget.h Thu Sep 15 14:51:39 2011 +0100 +++ b/src/historywidget.h Mon Oct 17 16:25:02 2011 +0100 @@ -37,6 +37,7 @@ virtual ~HistoryWidget(); void setCurrent(QStringList ids, QString branch, bool showUncommitted); + void setShowUncommitted(bool showUncommitted); void parseNewLog(QString log); void parseIncrementalLog(QString log);