diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 20:44:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 20:44:01 +0000 |
| commit | fb5a02906f644d044eb0286bf27d413ba0e05216 (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff) | |
| download | idea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java')
| -rw-r--r-- | plugins/git4idea/test-stepdefs/git4idea/GitCherryPickStepdefs.java | 4 |
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.*; |