From 42d3182614b82cfe139012fb3c66bfeae444b91a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:44:24 +0200 Subject: [PATCH] Remove deprecated MergeMessageFormatter#formatWithConflicts Change-Id: I3040f655318c47f268433294720a99325ae78863 --- .../jgit/merge/MergeMessageFormatter.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java index e0c083f55c..039d7d844c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java @@ -91,24 +91,6 @@ public class MergeMessageFormatter { return sb.toString(); } - /** - * Add section with conflicting paths to merge message. Lines are prefixed - * with a hash. - * - * @param message - * the original merge message - * @param conflictingPaths - * the paths with conflicts - * @return merge message with conflicting paths added - * @deprecated since 6.1; use - * {@link #formatWithConflicts(String, Iterable, char)} instead - */ - @Deprecated - public String formatWithConflicts(String message, - List conflictingPaths) { - return formatWithConflicts(message, conflictingPaths, '#'); - } - /** * Add section with conflicting paths to merge message. * -- 2.39.5