# HG changeset patch
# User Chris Cannam
# Date 1294243138 0
# Node ID 27bfdc28541efcc8e929bc60c58024f74da2862e
# Parent  43ecb0dcc44ec6ca8e8cd28a77557be2ce8016b8# Parent  4c5993d860f33752a97697ef888cc4f2815fdae2
Merge

diff -r 43ecb0dcc44e -r 27bfdc28541e mainwindow.cpp
--- a/mainwindow.cpp	Wed Jan 05 15:58:34 2011 +0000
+++ b/mainwindow.cpp	Wed Jan 05 15:58:58 2011 +0000
@@ -505,7 +505,10 @@
     QString diff = settings.value("extdiffbinary", "").toString();
     if (diff == "") {
         QStringList bases;
-        bases << "easyhg-extdiff-osx.sh" << "kompare" << "kdiff3" << "meld";
+#ifdef Q_OS_MAC
+        bases << "easyhg-extdiff-osx.sh";
+#endif 
+        bases << "kompare" << "kdiff3" << "meld";
         bool found = false;
         foreach (QString base, bases) {
             diff = findInPath(base, m_myDirPath, true);
@@ -533,7 +536,10 @@
     }
     QString merge;
     QStringList bases;
-    bases << "fmdiff3" << "meld" << "diffuse" << "kdiff3";
+#ifdef Q_OS_MAC
+    bases << "easyhg-merge-osx.sh";
+#endif
+    bases << "meld" << "diffuse" << "kdiff3";
     bool found = false;
     foreach (QString base, bases) {
         merge = findInPath(base, m_myDirPath, true);
@@ -563,7 +569,7 @@
             << "C:\\Program Files\\Windows NT\\Accessories\\wordpad.exe"
             << "notepad.exe"
 #elif defined Q_OS_MAC
-            << "textedit"
+            << "/Applications/TextEdit.app/Contents/MacOS/TextEdit"
 #else
             << "gedit" << "kate"
 #endif