Skip to content

Instantly share code, notes, and snippets.

@TakashiSasaki
TakashiSasaki / gist:3951766
Created October 25, 2012 10:02
Using WinMerge as a mergetool of git
# This file obsoletes http://pastebin.com/DUTrrYdv
[merge]
tool = WinMerge
[mergetool "WinMerge"]
path = C:/Program Files (x86)/WinMerge/WinMergeU.exe
cmd = \"C:/Program Files (x86)/WinMerge/WinMergeU.exe\" -dl \"$LOCAL\" -dm \"$BASE\" -dr \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -o \"$MERGED\"
[diff]

packages:

  • id: MathNet.Numerics.Core version: 3.17.0
  • id: OxyPlot.Core version: 2.0.0-unstable1013 uti: com.xamarin.workbook id: 744cd41b-7a5b-44a4-b17d-80a4297f0fc3 title: computation-expression platforms: