diff --git a/roles/home-cli/files/gitwindows b/roles/home-cli/files/gitwindows index 25118d9..47320ac 100644 --- a/roles/home-cli/files/gitwindows +++ b/roles/home-cli/files/gitwindows @@ -9,5 +9,3 @@ helper = manager [credential "https://dev.azure.com"] useHttpPath = true -[diff "utf16diff"] - textconv = utf16diff.cmd diff --git a/roles/home-cli/files/utf16diff.cmd b/roles/home-cli/files/utf16diff.cmd deleted file mode 100644 index a90dfa9..0000000 --- a/roles/home-cli/files/utf16diff.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@ECHO OFF -REM Add "*.ps1 diff=utf16diff" to ~/.config/git/attributes to use this. -powershell.exe -Command "%~dp0\utf16diff.ps1" "%1" diff --git a/roles/home-cli/files/utf16diff.ps1 b/roles/home-cli/files/utf16diff.ps1 deleted file mode 100644 index e56f0f6..0000000 --- a/roles/home-cli/files/utf16diff.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -[string]$file = $args[0] -[string]$encoding = $(&"C:\Program Files\Git\usr\bin\file.exe" -b --mime-encoding $file) -&"C:\Program Files\Git\usr\bin\iconv.exe" -c -f $encoding -t UTF-8 $file