Mercurial > hg > easyhg

diff filestatuswidget.h @ 163:5c262ac73948

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* First cut of work on merge/resolve logic
author Chris Cannam
date Fri, 03 Dec 2010 19:35:04 +0000
parents 78374cefa10f
children 6c15700f4103
line wrap: on
line diff
--- a/filestatuswidget.h	Fri Dec 03 14:43:32 2010 +0000
+++ b/filestatuswidget.h	Fri Dec 03 19:35:04 2010 +0000
@@ -64,6 +64,9 @@
     QStringList getSelectedRemovableFiles() const;
     QStringList getAllRemovableFiles() const;
 
+    QStringList getSelectedUnresolvedFiles() const;
+    QStringList getAllUnresolvedFiles() const;
+    
 signals:
     void selectionChanged();