Annotate JENKINS-34070 on a test that checks it

MarkEWaite · MarkEWaite · commit bb395fcd2774 · 2019-08-17T18:23:57.000-06:00
diff --git a/src/test/java/hudson/plugins/git/UserMergeOptionsTest.java b/src/test/java/hudson/plugins/git/UserMergeOptionsTest.java
@@ -204,7 +204,7 @@ public void equalsContract() {
                 .verify();
     }
 
-    @Issue("JENKINS-51638")
+    @Issue({"JENKINS-51638", "JENKINS-34070"})
     @Test
     public void mergeStrategyCase() throws Exception {
         Map<String, Object> args = new HashMap<>();

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public void equalsContract() {`
`204`	`204`	`.verify();`
`205`	`205`	`}`
`206`	`206`
`207`		`- @Issue("JENKINS-51638")`
	`207`	`+ @Issue({"JENKINS-51638", "JENKINS-34070"})`
`208`	`208`	`@Test`
`209`	`209`	`public void mergeStrategyCase() throws Exception {`
`210`	`210`	`Map<String, Object> args = new HashMap<>();`