From eef1e2b945d0eefd8dfd371d5d3c432608aaae2e Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Sun, 11 Jun 2017 22:31:02 +0100 Subject: repo: Improve gitignore and gitattributes The gitignore has been improved to ignore the following: - IDE configuration for Visual Studio, VSCode, and Rider - OS files for macOS, Linux, and Windows The gitattributes has been improved to properly diff the following: - Normalise line endings - Common Files - .md, .png, etc - C# Files - Visual Studio Files --- .../obj/Release/CoreCompileInputs.cache | 1 - .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 9614 -> 0 bytes .../TempPE/Properties.Resources.Designer.cs.dll | Bin 5632 -> 0 bytes ...tedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs | 0 ...tedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs | 0 ...tedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs | 0 .../TimeHACK.Engine.Properties.Resources.resources | Bin 155664 -> 0 bytes .../TimeHACK.Engine.Template.AboutBox95.resources | Bin 180 -> 0 bytes .../TimeHACK.Engine.Template.Infobox95.resources | Bin 180 -> 0 bytes .../TimeHACK.Engine.Template.Win9XBSOD.resources | Bin 180 -> 0 bytes .../TimeHACK.Engine.Template.WinClassic.resources | Bin 4593 -> 0 bytes .../TimeHACK.Engine.csproj.FileListAbsolute.txt | 96 --------------------- .../TimeHACK.Engine.csproj.GenerateResource.Cache | Bin 2531 -> 0 bytes ...ACK.Engine.csprojResolveAssemblyReference.cache | Bin 29957 -> 0 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 190464 -> 0 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 62976 -> 0 bytes 16 files changed, 97 deletions(-) delete mode 100644 TimeHACK.Engine/obj/Release/CoreCompileInputs.cache delete mode 100644 TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache delete mode 100644 TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll delete mode 100644 TimeHACK.Engine/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs delete mode 100644 TimeHACK.Engine/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs delete mode 100644 TimeHACK.Engine/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs delete mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources delete mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.AboutBox95.resources delete mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.Infobox95.resources delete mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.Win9XBSOD.resources delete mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources delete mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt delete mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache delete mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache delete mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll delete mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb (limited to 'TimeHACK.Engine/obj/Release') diff --git a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache deleted file mode 100644 index 128a272..0000000 --- a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -612fc8a605c5ba312ff8ca6bc02fe42cb98339bd diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 4103602..0000000 Binary files a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll deleted file mode 100644 index 86eea76..0000000 Binary files a/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and /dev/null differ diff --git a/TimeHACK.Engine/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/TimeHACK.Engine/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs deleted file mode 100644 index e69de29..0000000 diff --git a/TimeHACK.Engine/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/TimeHACK.Engine/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs deleted file mode 100644 index e69de29..0000000 diff --git a/TimeHACK.Engine/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/TimeHACK.Engine/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs deleted file mode 100644 index e69de29..0000000 diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources deleted file mode 100644 index 922e583..0000000 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources and /dev/null differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.AboutBox95.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.AboutBox95.resources deleted file mode 100644 index 6c05a97..0000000 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.AboutBox95.resources and /dev/null differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.Infobox95.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.Infobox95.resources deleted file mode 100644 index 6c05a97..0000000 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.Infobox95.resources and /dev/null differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.Win9XBSOD.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.Win9XBSOD.resources deleted file mode 100644 index 6c05a97..0000000 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.Win9XBSOD.resources and /dev/null differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources deleted file mode 100644 index 690267a..0000000 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources and /dev/null differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt deleted file mode 100644 index 6389a48..0000000 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,96 +0,0 @@ -D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll -D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb -D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache -D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources -D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache -D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll -D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources -I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll -I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb -I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll -I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources -I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources -I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources -I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources -I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources -I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache -I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll -I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb -C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll -C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb -C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll -C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache -C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources -C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources -C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources -C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources -C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources -C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache -C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll -C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb -D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll -D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources -D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources -D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources -D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources -C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll -C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb -C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll -C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache -C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources -C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources -C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources -C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources -C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources -C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache -C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll -C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb -C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll -C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb -C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll -C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache -C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources -C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources -C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources -C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources -C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources -C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache -C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll -C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb -C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll -C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb -C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll -C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache -C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources -C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources -C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources -C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources -C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources -C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache -C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll -C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb -I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache -C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll -C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb -C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll -C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache -C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources -C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources -C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources -C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources -C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources -C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache -C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll -C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache deleted file mode 100644 index 4d43d2f..0000000 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache and /dev/null differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache deleted file mode 100644 index 1de6ed7..0000000 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache and /dev/null differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll deleted file mode 100644 index 746c4e9..0000000 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll and /dev/null differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb deleted file mode 100644 index 9b17eca..0000000 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb and /dev/null differ -- cgit v1.2.3