rehannali

Custom Diff and Merge Tool for SourceTree - Mac

Sep 28th, 2020 (edited)
134
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!

Custom Diff and Merge Tool for SourceTree - Mac

Set custom path to VSCode pointing code

Path to code.

/usr/local/bin/code

If you don't know the exact path or the above path is not working for you.

Trying with $ which code or install code command line tools to work.

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"

Add Comment
Please, Sign In to add comment