mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
hg4idea: internal merge for tests
This commit is contained in:
@@ -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";
|
||||
|
||||
Reference in New Issue
Block a user