summaryrefslogtreecommitdiff
path: root/plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java')
-rw-r--r--plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java b/plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java
index 2fe42a0d76a1..553cf260e268 100644
--- a/plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java
+++ b/plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java
@@ -17,8 +17,7 @@ package git4idea;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
-import com.intellij.dvcs.test.MockVcsHelper;
-import com.intellij.dvcs.test.MockVirtualFile;
+import com.intellij.mock.MockVirtualFile;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.util.ThrowableComputable;
import com.intellij.openapi.util.text.StringUtil;
@@ -40,6 +39,7 @@ import cucumber.annotation.en.Then;
import cucumber.annotation.en.When;
import git4idea.cherrypick.GitCherryPicker;
import git4idea.config.GitVersionSpecialty;
+import git4idea.test.MockVcsHelper;
import java.util.*;