Mercurial > hg > easyhg

diff mainwindow.h @ 157:e411bb42d934

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Default merge comments
author Chris Cannam
date Thu, 02 Dec 2010 21:52:24 +0000
parents fb697ce0f625
children 910c2c5d1873
line wrap: on
line diff
--- a/mainwindow.h	Thu Dec 02 21:32:04 2010 +0000
+++ b/mainwindow.h	Thu Dec 02 21:52:24 2010 +0000
@@ -207,6 +207,7 @@
     QFileSystemWatcher *fsWatcher;
 
     bool justMerged;
+    QString mergeCommitComment;
 };
 
 #endif