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 ec1b599b77b8378e04fd7a258636f6ccd329e349..fc5ab6289825e6015a438476904312b61a891083 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; }