diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2019-08-09 12:11:41 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2019-08-09 12:11:41 +0900 |
| commit | ad02a7cbada59560fde64f9ecb361aabbd08b235 (patch) | |
| tree | 91ba3947c1b614308750fdf1e2cdf00fcb0eb622 /org.eclipse.jgit.test | |
| parent | 5a88815b1ceb3db7eaf46d22f20fa20270f6f7c4 (diff) | |
| download | jgit-ad02a7cbada59560fde64f9ecb361aabbd08b235.tar.gz jgit-ad02a7cbada59560fde64f9ecb361aabbd08b235.zip | |
Stop using deprecated Constants.CHARACTER_ENCODING
Change-Id: I105b8a05bc64f249879a0795a059958553cc60c6
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java index b131808318..61ab042890 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java @@ -302,7 +302,7 @@ public class MergeAlgorithmTest { MergeResult r = new MergeAlgorithm().merge(RawTextComparator.DEFAULT, T(commonBase), T(ours), T(theirs)); ByteArrayOutputStream bo=new ByteArrayOutputStream(50); - fmt.formatMerge(bo, r, "B", "O", "T", Constants.CHARACTER_ENCODING); + fmt.formatMerge(bo, r, "B", "O", "T", UTF_8.name()); return new String(bo.toByteArray(), UTF_8); } |