Mercurial > hg > easyhg
comparison common.cpp @ 36:5986d0758069
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 |
comparison
equal
deleted
inserted
replaced
| 35:7d8167182b73 | 36:5986d0758069 |
|---|---|
| 28 return QString("hg.exe"); | 28 return QString("hg.exe"); |
| 29 else | 29 else |
| 30 return QString("hg"); | 30 return QString("hg"); |
| 31 } | 31 } |
| 32 | 32 |
| 33 QString getDiffMergeDefaultPath() | |
| 34 { | |
| 35 if (getSystem() == "Windows") | |
| 36 return QString("c:\\program files\\sourcegear\\diffmerge\\diffmerge.exe"); | |
| 37 else | |
| 38 return QString("/usr/bin/diffmerge"); | |
| 39 } | |
| 40 | |
| 41 | 33 |
| 42 QString getHgDirName() | 34 QString getHgDirName() |
| 43 { | 35 { |
| 44 if (getSystem() == "Windows") | 36 if (getSystem() == "Windows") |
| 45 { | 37 { |