How to set up diff tool and merge tool as an android studio for GIT in MAC

Devrath
2 min readMay 8, 2022

--

When we are using the git commands for git operations to check the difference between the files in the working directory and staging area, Using the android studio as the diff tool is very useful.

Here I will show how to set the diff tool at the project level. I am using MAC as my operating system.

Steps Involved

Step1: Open the Git config file in your project

Step2: Paste the code below in the config file below the existing code

Step3: Click ToolsCommand-line launcher ….. Then press OK

Step4: Make changes in your android studio file so your working directory is different from the staging area and use the command git difftool as shown below.

Step5: It will ask for the option to launch the [Y/n] → type Y → Click enter. It will launch the diff tool. There you can make changes.

--

--

Devrath
Devrath

No responses yet