diff mainwindow.h @ 33:ff8d64625aa3

Added retry_merge. Fixed bug in "after merge" commit.

--- a/mainwindow.h	Tue Jun 15 03:16:40 2010 +0300
+++ b/mainwindow.h	Sat Jun 19 00:23:09 2010 +0300
@@ -40,7 +40,8 @@
     ACT_MERGE,
     ACT_RESOLVE_LIST,
     ACT_SERVE,
-    ACT_RESOLVE_MARK
+    ACT_RESOLVE_MARK,
+    ACT_RETRY_MERGE,
 };
 
 
@@ -85,6 +86,7 @@
     void hgUpdate();
     void hgRevert();
     void hgMerge();
+    void hgRetryMerge();
     void settings();
     void hgCloneFromRemote();
     void hgInit();
@@ -130,6 +132,7 @@
     QAction *settingsAct;
     QAction *exitAct;
 
+    //Repo actions
     QAction *hgIncomingAct;
     QAction *hgPushAct;
     QAction *hgPullAct;
@@ -143,6 +146,7 @@
     QAction *hgUpdateAct;
     QAction *hgCommitAct;
     QAction *hgMergeAct;
+    QAction *hgRetryMergeAct;
     QAction *hgUpdateToRevAct;
     QAction *hgAnnotateAct;
     QAction *hgResolveListAct;
@@ -166,8 +170,9 @@
     HGACTIONS   runningAction;
     HgRunner    *runner;
 
-    int         tabPage;
+    int             tabPage;
     unsigned char   initialFileTypesBits;
+    bool            justMerged;
 };
 
 #endif