Fixed merge problem with imports.

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandService.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandService.java
index bb6a8c861d5ddcf9948740fc96ec7353c9e983e1..ddc5381d88bbee4b8779a67f0f828490480757a7 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandService.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandService.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsUtil;
 import org.zmlx.hg4idea.HgGlobalSettings;
 import org.zmlx.hg4idea.HgUtil;
+import org.zmlx.hg4idea.HgVcs;
 import org.zmlx.hg4idea.HgVcsMessages;
 
 import javax.swing.*;