hg4idea: internal merge for tests

This commit is contained in:
Roman Shevchenko
2013-06-07 20:13:02 +04:00
parent c4871543d0
commit 52b7cd693a
2 changed files with 4 additions and 2 deletions
@@ -1,2 +1,5 @@
[ui]
username = John Doe <John.Doe@example.com>
[merge-patterns]
** = internal:merge
@@ -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";