Mercurial > hg > easyhg

diff common.cpp @ 36:5986d0758069

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Version 0.5.3. Fixed .hgignore editing in windows.
author Jari Korhonen <jtkorhonen@gmail.com>
date Sat, 19 Jun 2010 03:10:51 +0300
parents 45bfb8dc1faf
children f583e44d9d31
line wrap: on
line diff
--- a/common.cpp	Sat Jun 19 02:01:54 2010 +0300
+++ b/common.cpp	Sat Jun 19 03:10:51 2010 +0300
@@ -30,14 +30,6 @@
         return QString("hg");
 }
 
-QString getDiffMergeDefaultPath()
-{
-    if (getSystem() == "Windows")
-        return QString("c:\\program files\\sourcegear\\diffmerge\\diffmerge.exe");
-    else
-        return QString("/usr/bin/diffmerge");
-}
-
 
 QString getHgDirName()
 {