# HG changeset patch
# User Chris Cannam
# Date 1294158843 0
# Node ID fccfd12faac1ca6a36254f82f3f7521ae59de722
# Parent  583faa8dadb6ed5e904e00e537c23c4751e4cc90# Parent  49bf8cc4f6b26f8c1af9e794b06c6ebb3f484299
Merge

diff -r 49bf8cc4f6b2 -r fccfd12faac1 mainwindow.cpp
--- a/mainwindow.cpp	Tue Jan 04 16:24:27 2011 +0000
+++ b/mainwindow.cpp	Tue Jan 04 16:34:03 2011 +0000
@@ -190,6 +190,8 @@
 void MainWindow::hgTest()
 {
     QStringList params;
+    //!!! should we test version output? Really we want at least 1.7.x
+    //!!! for options such as merge --tool
     params << "--version";
     runner->requestAction(HgAction(ACT_TEST_HG, m_myDirPath, params));
 }