Mercurial > hg > easyhg
diff src/changesetitem.h @ 387:ce6a70970808 item_appearance_adjustments
Use a plain small circle for merge commits
author | Chris Cannam |
---|---|
date | Tue, 24 May 2011 16:26:15 +0100 |
parents | b9c153e00e84 |
children | ef31a55c86b6 |
line wrap: on
line diff
--- a/src/changesetitem.h Tue May 24 14:05:35 2011 +0100 +++ b/src/changesetitem.h Tue May 24 16:26:15 2011 +0100 @@ -100,6 +100,10 @@ QMap<QAction *, QString> m_parentDiffActions; QMap<QAction *, QString> m_summaryActions; + + bool isMerge() const; + virtual void paintNormal(QPainter *); + virtual void paintMerge(QPainter *); }; #endif // CHANGESETITEM_H