diff --git a/plugins/hg4idea/testData/repo/dot_hg/hgrc b/plugins/hg4idea/testData/repo/dot_hg/hgrc
index c7599552927c..0c817f1bf6a4 100644
--- a/plugins/hg4idea/testData/repo/dot_hg/hgrc
+++ b/plugins/hg4idea/testData/repo/dot_hg/hgrc
@@ -1,2 +1,5 @@
 [ui]
 username = John Doe <John.Doe@example.com>
+
+[merge-patterns]
+** = internal:merge
diff --git a/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRealRepositoryReaderTest.java b/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRealRepositoryReaderTest.java
index 952085929a65..7089ca499974 100644
--- a/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRealRepositoryReaderTest.java
+++ b/plugins/hg4idea/testSrc/hg4idea/test/repo/HgRealRepositoryReaderTest.java
@@ -44,7 +44,7 @@ public class HgRealRepositoryReaderTest extends HgPlatformTest {
   }
 
   public void testMergeState() {
-    hg("merge --tool internal:merge branchB");
+    hg("merge branchB");
     assertEquals(myRepositoryReader.readState(), Repository.State.MERGING);
   }
 
@@ -60,7 +60,6 @@ public class HgRealRepositoryReaderTest extends HgPlatformTest {
     TestRepositoryUtil.assertEqualCollections(myRepositoryReader.readBranches(), Arrays.asList("default", "branchA", "branchB"));
   }
 
-
   private void createBranches() {
     cd(myRepository);
     String aFile = "A.txt";