diff --git a/tortoisemerge.json b/tortoisemerge.json deleted file mode 100644 index f9c3d54b22..0000000000 --- a/tortoisemerge.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": "1.6.7", - "license": "GPL", - "url": "http://downloads.sourceforge.net/project/tortoisesvn/Tools/1.6.7/TortoiseDiff-1.6.7.zip", - "hash": "f530dc5d460ca6e27912bee68a8a5dc54a2e9263ac6e932438240571f92515fa", - "bin": ["tortoisemerge.exe"], - "post_install": - "try { $null = gcm git -ea stop; git config --global mergetool.tortoisemerge.path $(scoop which tortoisemerge) } catch { }", - "notes": "If you would like to use TortoiseMerge with Git, run: - - git config --global merge.tool tortoisemerge" -} \ No newline at end of file diff --git a/winmerge.json b/winmerge.json deleted file mode 100644 index f77067fda3..0000000000 --- a/winmerge.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "version": "2.14.0", - "license": "GPL2", - "url": "http://downloads.sourceforge.net/project/winmerge/stable/2.14.0/WinMerge-2.14.0-exe.zip", - "hash": "9c77580ff9594536ce84dbbf0095e4b8654892a713989c378b9349c833c0f177", - "extract_dir": "WinMerge-2.14.0-exe", - "bin": "WinMergeU.exe" -} \ No newline at end of file