MergeFormatterPass: Remove constructor taking charset name as string

Since this constructor is package-private, so instead of deprecating
it, we can remove it right away.

Change-Id: I84ba72e8c94fb09412bbf7ce73b7eec72f61e964
Signed-off-by: Jonathan Nieder <jrn@google.com>

org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java

@@ -83,7 +83,7 @@ public class MergeFormatter {
 	@Deprecated
 	public void formatMerge(OutputStream out, MergeResult<RawText> res,
 			List<String> seqName, String charsetName) throws IOException {
-		new MergeFormatterPass(out, res, seqName, charsetName).formatMerge();
+		formatMerge(out, res, seqName, Charset.forName(charsetName));
 	}
 
 	/**

org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatterPass.java

@@ -68,31 +68,6 @@ class MergeFormatterPass {
 										// a conflict
 
 	/**
-	 * @deprecated use
-	 *             {@link #MergeFormatterPass(OutputStream, MergeResult, List, Charset)}
-	 *             instead.
-	 * @param out
-	 *            the {@link java.io.OutputStream} where to write the textual
-	 *            presentation
-	 * @param res
-	 *            the merge result which should be presented
-	 * @param seqName
-	 *            When a conflict is reported each conflicting range will get a
-	 *            name. This name is following the "<<<<<<<
-	 *            " or ">>>>>>> " conflict markers. The
-	 *            names for the sequences are given in this list
-	 * @param charsetName
-	 *            the name of the character set used when writing conflict
-	 *            metadata
-	 */
-	@Deprecated
-	MergeFormatterPass(OutputStream out, MergeResult<RawText> res, List<String> seqName,
-			String charsetName) {
-		this(out, res, seqName, Charset.forName(charsetName));
-	}
-
-	/**
-	 *
 	 * @param out
 	 *            the {@link java.io.OutputStream} where to write the textual
 	 *            presentation