Merge branch 'master' into multiroot_branch
[idea/community.git] / plugins / git4idea / src / git4idea / merge / GitMergeProvider.java
index ca56cfa9b717da880206e4a923678f1a6cd228a3..3b18a93055023782d33027f7f59e0773af9d7882 100644 (file)
@@ -30,11 +30,11 @@ import com.intellij.vcsUtil.VcsRunnable;
 import com.intellij.vcsUtil.VcsUtil;
 import git4idea.GitFileRevision;
 import git4idea.GitRevisionNumber;
-import git4idea.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.commands.GitCommand;
-import git4idea.commands.GitFileUtils;
+import git4idea.util.GitFileUtils;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.commands.StringScanner;
+import git4idea.util.StringScanner;
 import git4idea.i18n.GitBundle;
 import org.jetbrains.annotations.NotNull;