Mercurial > hg > easyhg

comparison 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
comparison
equal deleted inserted replaced
156:4999dbf3a266 157:e411bb42d934
205 QString diffBinaryName; 205 QString diffBinaryName;
206 206
207 QFileSystemWatcher *fsWatcher; 207 QFileSystemWatcher *fsWatcher;
208 208
209 bool justMerged; 209 bool justMerged;
210 QString mergeCommitComment;
210 }; 211 };
211 212
212 #endif 213 #endif