<BUG>import javax.swing.event.HyperlinkEvent;import java.util.*;</BUG><CONTEXT>import git4idea.commands.GitCommandResult;import git4idea.repo.GitRepository;import git4idea.repo.GitRepositoryManager;import git4idea.util.StringScanner;import org.jetbrains.annotations.NotNull;<extra_id_0>public class GitConflictResolver {private static final Logger LOG = Logger.getInstance(GitConflictResolver.class);@NotNull protected final Project myProject;</CONTEXT>
import java.io.File;import java.util.*;