comparison src/hgtabwidget.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

     void addIncrementalLog(QString hgLogList);
 
     void setLocalPath(QString workFolderPath);
 
     void setCurrent(QStringList ids, QString branch);
+
+    void setHaveMerge(bool);
 
     void updateFileStates();
     void updateHistory();
 
     FileStates getFileStates() { return m_fileStates; }

 
 private:
     FileStatusWidget *m_fileStatusWidget;
     HistoryWidget *m_historyWidget;
     FileStates m_fileStates;
+    bool m_haveMerge;
 
     Changesets parseChangeSets(QString changeSetsStr);
 };
 
 #endif // HGTABWIDGET_H