>From 9f7d43f29eaf6017b7b16261ce91d8ef182cf415 Mon Sep 17 00:00:00 2001 In-Reply-To: <20171218131249.GB4665@xxxxxxxxxxxxxxxxxxxxx> References: <20171218131249.GB4665@xxxxxxxxxxxxxxxxxxxxx> From: =?UTF-8?q?Torsten=20B=C3=B6gershausen?= <tboegi@xxxxxx> Date: Fri, 23 Feb 2018 20:53:34 +0100 Subject: [PATCH 0/1] Auto diff of UTF-16 files in UTF-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make it possible to show a user-readable diff for UTF-16 encoded files. This would replace the "binary files differ" with something useful, without breaking anything for existing users (?). For future repos the w-t-e encoding can be used, which allows e.g. easier merging. People which stick to native UTF-16 because they need the compatiblity with e.g. libgit2 can still get a readable diff. Opinions ? Torsten Bögershausen (1): Auto diff of UTF-16 files in UTF-8 diff.c | 43 ++++++++++++++++++++- diffcore.h | 3 ++ t/t4066-diff-encoding.sh | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ utf8.h | 11 ++++++ 4 files changed, 153 insertions(+), 2 deletions(-) create mode 100755 t/t4066-diff-encoding.sh -- 2.16.1.194.gb2e45c695d