mirror of
https://github.com/ScoopInstaller/Main.git
synced 2025-11-01 06:11:20 +00:00
move GUI merge programs to extras bucket
This commit is contained in:
parent
30e43c0b6c
commit
1ef18af458
@ -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"
|
||||
}
|
||||
@ -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"
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user