]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fbf6ce6) | patch
MergeFormatter{Pass}: Use Charset instead of String 88/130188/2
authorDavid Pursehouse <david.pursehouse@gmail.com>
Sat, 29 Sep 2018 05:58:48 +0000 (14:58 +0900)
committerDavid Pursehouse <david.pursehouse@gmail.com>
Sun, 30 Sep 2018 05:34:14 +0000 (14:34 +0900)
commitb65a310abcaf7649802a92114038b5458822eddb
treea4ef552e68b5b2ed6c2d44acf213bde783dc1699tree | snapshot
parentfbf6ce65ba2cba7ef1dd67d30922c9b887e60303commit | diff
MergeFormatter{Pass}: Use Charset instead of String

Deprecate constructors and methods taking a character set name as
a String, in favor of new variants taking a Charset.

Change-Id: I616c601daf232fa17610dba1087fd902030d46ea
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatterPass.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit