[Step 0][SourceTree] Setup - Yellow-Team-Millerslab/GitPlayground GitHub Wiki

Setup Diff/Merge tool by using VS2017 Tool

1. Go to the top menu, Tools > Options

   

2. Switch to Diff tab,

   

3. select external diff tool and merge tool as custom.

   

• For Diff Tool:

  Commands: C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe

  Arguments: "$LOCAL" "$REMOTE" //t

• For Merge Tool Commands: C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe

  Arguments: "$REMOTE" "$LOCAL" "$BASE" "$MERGED" //m