Mercurial Mercurial > sheepy-clone / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
QTfrontend/ui/widget/keybinder.h
changeset 14906 089f0c10ca95
parent 14905 505c8d101be3 
--- a/QTfrontend/ui/widget/keybinder.h	Tue May 07 19:39:08 2019 +0200
+++ b/QTfrontend/ui/widget/keybinder.h	Tue May 07 20:23:51 2019 +0200
@@ -60,6 +60,7 @@
         QIcon * conflictIcon;
         QString defaultText;
         bool enableSignal;
+        QList<QTableWidgetItem*> conflictItems;
         bool p_hasConflicts;
 
     signals:
sheepy-clone