itssoap/ScoopInstaller_Main
1
0
Fork 0
mirror of https://github.com/ScoopInstaller/Main.git synced 2025-11-06 08:41:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

TortoiseMerge 1.6.7, WinMerge 2.14.0

Browse Source
This commit is contained in:
Luke Sampson 2013-07-12 17:34:49 +10:00
parent 5fc1db2288
commit f6955172fe
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tortoisemerge.json Normal file
View File

@ -0,0 +1,12 @@
{
"version": "1.6.7",
"license": "GPL",
"url": "http://downloads.sourceforge.net/project/tortoisesvn/Tools/1.6.7/TortoiseDiff-1.6.7.zip",
"hash": "sha256: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"
}

8
winmerge.json Normal file
View File

@ -0,0 +1,8 @@
{
"version": "2.14.0",
"license": "GPL2",
"url": "http://downloads.sourceforge.net/project/winmerge/stable/2.14.0/WinMerge-2.14.0-exe.zip",
"hash": "sha256:9c77580ff9594536ce84dbbf0095e4b8654892a713989c378b9349c833c0f177",
"unzip_folder": "WinMerge-2.14.0-exe",
"bin": "WinMergeU.exe"
}