Files
gerrit/java/com/google/gerrit/server/git
David Pursehouse 6c62bf7944 MergeUtil: Pass Charset directly to MergeFormatter.formatMerge
Since [1] the variant of #formatMerge that takes the charset name as
a String is deprecated in favor of a new one that takes a Charset.

[1] https://git.eclipse.org/r/#/c/130188/

Change-Id: Idcb8982fdfa4939ebf60951fd5031fd9cc47cb0f
2018-12-13 14:39:13 +09:00
..