From c9c68980f322acce5ba5b58a495f0535e58f67bf Mon Sep 17 00:00:00 2001 From: Iain Patterson Date: Sun, 28 Feb 2016 09:01:09 +0000 Subject: [PATCH] Help git figure out how to diff .mc and .rc files. Visual Studio wants .mc and .rc files to be UTF-16LE, which git thinks are binary. Use .gitattributes to force treating them as text only when diffing, explicitly not handling them as text when submitting as they must retain their encoding to keep Visual Studio happy. Thanks to Mathias Breiner for proposing the use of .gitattributes in the repo. I had the rules in .git/info/exclude in my working copy for a long time and forgot about the issue! --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..c69ca9c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.mc diff +*.rc diff -- 2.20.1