diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-11-19 13:19:03 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-11-19 13:19:03 +0100 |
| commit | 76efd28bc91caa914eb4c16656c2928f92400547 (patch) | |
| tree | cfe784f3c2c8d366484833836a885566dae31b51 /org.eclipse.jgit/src | |
| parent | 85c84f2fab0ac49a17a03f16f950ddbde5bcf836 (diff) | |
| download | jgit-76efd28bc91caa914eb4c16656c2928f92400547.tar.gz jgit-76efd28bc91caa914eb4c16656c2928f92400547.zip | |
RecursiveMerger: fix boxing warning
Change-Id: I6f6ae540b128ff6b965931e829da1368a8b88ddb
Diffstat (limited to 'org.eclipse.jgit/src')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 ec1b599b77..fc5ab62898 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 @@ public class RecursiveMerger extends ResolveMerger { 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; } |