提交 1e804fdf 编写于 作者: K Kohsuke Kawaguchi

Looks like an interesting form of a merge conflict.

上级 82e5866e
......@@ -3,7 +3,7 @@ package hudson.cli;
import static hudson.cli.CLICommandInvoker.Matcher.failedWith;
import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.CoreMatchers.is;
import jenkins.model.Jenkins;
......
......@@ -27,7 +27,7 @@ package hudson.cli;
import static hudson.cli.CLICommandInvoker.Matcher.*;
import jenkins.model.Jenkins;
import org.apache.tools.ant.filters.StringInputStream;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.*;
import org.junit.Rule;
import org.junit.Test;
......
......@@ -27,6 +27,7 @@ package hudson.cli;
import static hudson.cli.CLICommandInvoker.Matcher.*;
import static org.junit.Assert.*;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.Matchers.*;
import static org.hamcrest.text.StringContainsInOrder.stringContainsInOrder;
import java.io.PrintStream;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册