From f33702dd29412a6a38671c757c83c3717aae47ca Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 5 Sep 2020 23:28:06 +0200 Subject: GitlinkMergeTest: fix boxing warnings Change-Id: I4bdf1ab3e7d7e9d96318e2b16b792aa98ebd2ecd Signed-off-by: Matthias Sohn --- org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'org.eclipse.jgit.test') diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java index c850b4d749..f410960bec 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java @@ -151,7 +151,7 @@ public class GitlinkMergeTest extends SampleDataRepositoryTestCase { ObjectId t = commit(ow, treeT, new ObjectId[] { b }); boolean merge = merger.merge(new ObjectId[] { o, t }); - assertEquals(shouldMerge, merge); + assertEquals(Boolean.valueOf(shouldMerge), Boolean.valueOf(merge)); return merger; } -- cgit v1.2.3