Mercurial > hg > mercurial

diff mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigImpl.java @ 671:3cc513b9e3c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use non-interactive merge
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Wed, 16 Oct 2013 14:33:41 +0400
parents bcee3a8b2c7b
children 31a1aca3305c
line wrap: on
line diff
--- a/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigImpl.java	Tue Oct 15 22:46:42 2013 +0400
+++ b/mercurial-server/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/ServerPluginConfigImpl.java	Wed Oct 16 14:33:41 2013 +0400
@@ -100,4 +100,8 @@
   public int listFilesTTLSeconds() {
     return TeamCityProperties.getInteger("teamcity.hg.listFilesTTLSeconds", 60);
   }
+
+  public String getMergeTool() {
+    return TeamCityProperties.getProperty("teamcity.hg.mergeTool", "internal:merge");
+  }
 }