Mercurial > hg > easyhg
diff settingsdialog.cpp @ 269:f6b71fda5957
* Rename the -osx.sh files to plain .sh, since we could use them elsewhere too. Rely on bundled kdiff3 if it exists.
author | Chris Cannam |
---|---|
date | Thu, 20 Jan 2011 13:37:00 +0000 |
parents | 8fd71f570884 |
children | 256138a4ed0e |
line wrap: on
line diff
--- a/settingsdialog.cpp Mon Jan 17 11:44:17 2011 +0000 +++ b/settingsdialog.cpp Thu Jan 20 13:37:00 2011 +0000 @@ -261,9 +261,7 @@ QString diff = settings.value("extdiffbinary", "").toString(); if (diff == "") { QStringList bases; -#ifdef Q_OS_MAC - bases << "easyhg-extdiff-osx.sh"; -#endif + bases << "easyhg-extdiff.sh"; bases << "kompare" << "kdiff3" << "meld"; bool found = false; foreach (QString base, bases) { @@ -289,13 +287,10 @@ } QString merge; QStringList bases; -#ifdef Q_OS_MAC - bases << "easyhg-merge-osx.sh"; -#endif - // I think this is too dangerous, given command line ordering - // differences and suchlike. Need to make sure the hg - // installation is configured OK instead -// bases << "meld" << "diffuse" << "kdiff3"; + bases << "easyhg-merge.sh"; + // 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) { merge = findInPath(base, m_installPath, true);