From 76efd28bc91caa914eb4c16656c2928f92400547 Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Tue, 19 Nov 2024 13:19:03 +0100
Subject: [PATCH] RecursiveMerger: fix boxing warning
Change-Id: I6f6ae540b128ff6b965931e829da1368a8b88ddb
---
.../src/org/eclipse/jgit/merge/RecursiveMerger.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
index ec1b599b7..fc5ab6289 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java
@@ -249,7 +249,7 @@ private String failingPathsMessage() {
if (failingPaths.size() > max) {
failedPaths = String.format("%s\n... (%s failing paths omitted)", //$NON-NLS-1$
- failedPaths, failingPaths.size() - max);
+ failedPaths, Integer.valueOf(failingPaths.size() - max));
}
return failedPaths;
}
--
GitLab