Mercurial > hg > easyhg

diff settingsdialog.cpp @ 272:256138a4ed0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Add easyhg-merge.bat and use it. (This isn't necessary if hg has been properly configured, as the Tortoise distribution has)
author Chris Cannam
date Tue, 25 Jan 2011 16:12:23 +0000
parents f6b71fda5957
children cc95394e2392
line wrap: on
line diff
--- a/settingsdialog.cpp	Thu Jan 20 13:56:01 2011 +0000
+++ b/settingsdialog.cpp	Tue Jan 25 16:12:23 2011 +0000
@@ -261,7 +261,11 @@
     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) {
@@ -287,7 +291,11 @@
     }
     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