Mercurial > hg > easyhg

diff mainwindow.h @ 329:ef977e7482cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "filelist_right_button_menu"
author Chris Cannam
date Fri, 11 Mar 2011 18:08:35 +0000
parents 6e1fdda1dff2
children acfe9390d5c6
line wrap: on
line diff
--- a/mainwindow.h	Wed Mar 02 16:29:17 2011 +0000
+++ b/mainwindow.h	Fri Mar 11 18:08:35 2011 +0000
@@ -78,8 +78,7 @@
     void hgUpdate();
     void hgRevert();
     void hgMerge();
-    void hgMarkResolved(QStringList);
-    void hgRetryMerge();
+    void hgRedoMerge();
     void hgCloneFromRemote();
     void hgInit();
     void hgIncoming();
@@ -95,6 +94,17 @@
     void hgServe();
     void hgIgnore();
 
+    void hgAnnotateFiles(QStringList);
+    void hgDiffFiles(QStringList);
+    void hgCommitFiles(QStringList);
+    void hgRevertFiles(QStringList);
+    void hgAddFiles(QStringList);
+    void hgRemoveFiles(QStringList);
+    void hgRedoFileMerges(QStringList);
+    void hgMarkFilesResolved(QStringList);
+    void hgIgnoreFiles(QStringList);
+    void hgUnIgnoreFiles(QStringList);
+
     void fsDirectoryChanged(QString);
     void fsFileChanged(QString);
     void checkFilesystem();