diff options
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |