- Install meld
- Add location of
meld.exe
to the PATH, e.g.C:\Program Files (x86)\Meld
- In SourceTree, go to Tools/Options/Diff
- In
External Diff Tool
, chooseCustom
- Enter
meld
inDiff Command
and$LOCAL $REMOTE
inArguments
- Click Ok and restart SourceTree
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[Adblock Plus 2.0] | |
! Title: Brave block list | |
! Author: Chin | |
! Version: 0.1 | |
! Expires: 1 days | |
! Description: Filters to fix advertisements | |
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | |
! This is a comment | |
||diagramjawlineunhappy.com^ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
' Visual Basic Script program to reset the DMA status of all ATA drives | |
' Copyright © 2006 Hans-Georg Michna | |
' Version 2007-04-04 | |
' Works in Windows XP, probably also in Windows 2000 and NT. | |
' Does no harm if Windows version is incompatible. | |
If MsgBox("This program will now reset the DMA status of all ATA drives with Windows drivers." _ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
internal void ApplySettings(IDictionary<string, string> appSettings) | |
{ | |
this.DelayBetweenSendKeys = PlaybackSettings.GetConfigOptionValueInt("DelayBetweenSendKeys", 10, appSettings); | |
this.DelayBetweenActions = PlaybackSettings.GetConfigOptionValueInt("DelayBetweenActions", 100, appSettings); | |
this.SearchTimeout = PlaybackSettings.GetConfigOptionValueInt("SearchTimeout", 120000, appSettings); | |
this.SearchInMinimizedWindows = PlaybackSettings.GetConfigOptionValue<bool>("SearchInMinimizedWindows", true, appSettings); | |
this.MatchExactHierarchy = PlaybackSettings.GetConfigOptionValue<bool>("MatchExactHierarchy", false, appSettings); | |
this.SmartMatchOptions = PlaybackSettings.GetSmartMatchOptions(appSettings); | |
this.ThinkTimeMultiplier = PlaybackSettings.GetConfigOptionValueDouble("ThinktimeMultiplier", 1.0, appSettings); | |
this.WaitForReadyTimeout = PlaybackSettings.GetConfigOptionValueInt("WaitForReadyTimeout", 60000, appSettings); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Simulation: 1000000 battles | |
Simulation progress: | |
Player 2 won: 498443 | |
Player 1 won: 501557 | |
Time: 385.15s | |
Go back to main page | |
Most frequent appearance in win team: | |
Guillaume, Fanatic: 19613 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{ | |
"scalePatternParams": { | |
"202": [ | |
1.5, | |
1 | |
], | |
"203": [ | |
1.75, | |
1.25, | |
1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[user] | |
name = foo | |
email = [email protected] | |
[core] | |
autocrlf = true | |
[difftool "sourcetree"] | |
cmd = 'C:/Program Files (x86)/Meld/meld/meld.exe' \"$LOCAL\" \"$REMOTE\" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import com.google.common.collect.Collections2; | |
import java.util.*; | |
public class ChampionsLeague { | |
public static class Team{ | |
String name, country; | |
int place; | |
char group; | |
public Team(){} | |
public Team(String name, String country, int place, char group){ | |
this.name=name; |