comparison settingsdialog.cpp @ 272:256138a4ed0e

* Add easyhg-merge.bat and use it. (This isn't necessary if hg has been properly configured, as the Tortoise distribution has)

     QSettings settings;
     settings.beginGroup("Locations");
     QString diff = settings.value("extdiffbinary", "").toString();
     if (diff == "") {
         QStringList bases;
+#ifdef Q_OS_WIN32
+        bases << "easyhg-extdiff.bat";
+#else
         bases << "easyhg-extdiff.sh";
+#endif
         bases << "kompare" << "kdiff3" << "meld";
         bool found = false;
         foreach (QString base, bases) {
             diff = findInPath(base, m_installPath, true);
             if (diff != "") {

     if (settings.contains("mergebinary")) {
         return;
     }
     QString merge;
     QStringList bases;
+#ifdef Q_OS_WIN32
+    bases << "easyhg-merge.bat";
+#else
     bases << "easyhg-merge.sh";
+#endif
     // NB it's not a good idea to add other tools here, as command
     // line argument ordering varies.  Configure them through hgrc
     // instead
     bool found = false;
     foreach (QString base, bases) {