segilbert

Stop-Service Docker 
Remove-Item  (Join-Path -Path $Env:ProgramData -ChildPath "docker") -Recurse -Force 
Invoke-WebRequest https://get.docker.com/builds/Windows/x86_64/docker-1.13.0.zip -UseBasicParsing -OutFile docker.zip 
Expand-Archive docker.zip -DestinationPath $Env:ProgramFiles -Force
Remove-Item -Force docker.zip 
Start-Service Docker

segilbert

1. Open Conemu

2. Open Settings -> Tasks or go to new tab button -> Setup tasks.

3. Click + to add a new task

4. Enter the name as Bash::Git bash or whatever you like

5. Task parameters:

     /icon "C:\Program Files\Git\mingw64\share\git\git-for-windows.ico" /dir "C:\data\work\git"
   

6. Command:

segilbert

[diff]
  tool = vsdiffmerge
[difftool]
  prompt = false
[difftool "vsdiffmerge"]
  cmd = '"C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE/vsdiffmerge.exe"' "$LOCAL" "$REMOTE" //t
  keepbackup = false
  trustexitcode = true
[merge]
  tool = vsdiffmerge

segilbert

[diff]
	tool = semanticmerge
[difftool "semanticmerge"]
	cmd = \"C:\\Users\\User\\AppData\\Local\\semanticmerge\\semanticmergetool.exe\" -s \"$LOCAL\" -d \"$REMOTE\"
[difftool]
	prompt = false
[merge]
	tool = semanticmerge
[mergetool "semanticmerge"]
	cmd = \"C:\\Users\\User\\AppData\\Local\\semanticmerge\\semanticmergetool.exe\" -s \"$LOCAL\" -d \"$REMOTE\"  -b \"$BASE\" -r \"$MERGED\"