Skip to content
Permalink
Browse files
[JENKINS-9843] Forgot to record what problem this was fixing.
  • Loading branch information
jglick committed Jun 19, 2014
1 parent ec81310 commit 2ca619d576e3d40c194eae84a986c37c1986dcae
Showing 1 changed file with 2 additions and 0 deletions.
@@ -34,12 +34,14 @@
import org.jenkinsci.plugins.gitclient.MergeCommand;
import org.junit.Test;
import org.junit.Rule;
import org.jvnet.hudson.test.Issue;
import org.jvnet.hudson.test.JenkinsRule;

public class PreBuildMergeOptionsTest {

@Rule public JenkinsRule r = new JenkinsRule();

@Issue("JENKINS-9843")
@Test public void exporting() throws Exception {
FreeStyleProject p = r.createFreeStyleProject();
p.setScm(new GitSCM(Collections.singletonList(new UserRemoteConfig("http://wherever/thing.git", "repo", null, null)), null, null, null, null, null, Collections.<GitSCMExtension>singletonList(new PreBuildMerge(new UserMergeOptions("repo", "master", MergeCommand.Strategy.DEFAULT.name())))));

0 comments on commit 2ca619d

Please sign in to comment.