Mercurial > hg > mercurial

diff mercurial-tests/src/testng.xml @ 638:7c017b6aa438

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests for merge support
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Mon, 19 Aug 2013 16:27:34 +0400
parents 109d7d3cdc8f
children 0b50d7952a7d
line wrap: on
line diff
--- a/mercurial-tests/src/testng.xml	Mon Aug 19 15:07:42 2013 +0400
+++ b/mercurial-tests/src/testng.xml	Mon Aug 19 16:27:34 2013 +0400
@@ -32,6 +32,7 @@
       <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.MercurialXmlLogParserTest"/>
       <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.HgVcsRootFactoryTest"/>
       <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.SubRepoTest"/>
+      <class name="jetbrains.buildServer.buildTriggers.vcs.mercurial.MergeSupportTest"/>
     </classes>
   </test>
 </suite>