Custom Diff and Merge for Sourcetree - Windows


        
            
                Markdown 0.41 KB
                                    
                        | None                    
                
                                        |
    0    0                            

            
                
                                    raw
                    download
                    clone
                    embed
                    print
                
                                    report
                
                
                            
        
        
            Custom Diff and Merge Tool for SourceTree - Windows
Set custom path to VSCode pointing code.cmd
Path to code.cmd.

C:\Users[username]\AppData\Local\Programs\Microsoft VS Code\bin\code.cmd

The commandline tools are used for diff and merge
DIFF
--diff --wait "$LOCAL" "$REMOTE"
OR
-d -w"$LOCAL" "$REMOTE"
MERGE
-n --wait "$MERGED"
OR
-n -w "$MERGED"