Using Git and I want to merge branch lisa into my master branch, like this:
$ git merge lisa
So I opened my repository and then to .git in
Assuming you have code command in your path, you can also just run the following command in your terminal:
code
git difftool -x "code --wait --diff"
No need to touch the git configurations