Remove deprecated MergeMessageFormatter#formatWithConflicts

Change-Id: I3040f655318c47f268433294720a99325ae78863

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 e0c083f55cc18ff4de58557e265568b3030d3a82..039d7d844cf370918640257a4e3563c8f38ec083 100644 (file)
--- 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<String> conflictingPaths) {
-               return formatWithConflicts(message, conflictingPaths, '#');
-       }
-
        /**
         * Add section with conflicting paths to merge message.
         *