fix: file name encoding issues. fix: when resolving merge conflicts, japanese file names become garbled. Kazuhiro Kato (2): Fixing file name encoding issues. fix: when resolving merge conflicts, japanese file names become garbled. gitk-git/gitk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) base-commit: bc204b742735ae06f65bb20291c95985c9633b7f Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1886%2Fkkato233%2Ffix_filename_encoding-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1886/kkato233/fix_filename_encoding-v1 Pull-Request: https://github.com/git/git/pull/1886 -- gitgitgadget