I was using Tortoise GIT in windows OS which had TortoiseGitMerge editor where I can see the differences between 2 files, copy changes from left to right and vice versa, Edit the file directly while seeing the differences.
Is there a similar editor that I can download for MAC OS when using SourceTree because SourceTree sadly does not provide a good inbuilt editor by default.
I used kdiff but it is not allowing me to edit the files easily like the TortoiseGitMerge editor