git

Make sure that the sub-directory/sub-module doesn't have .git directory. If it does, delete the .git directory inside the sub-directory/sub-module rm -rf [sub-module]/.git   Clear the git cache git rm --cached [sub-module]  

This is a simple guide to configure your git merge tool and diff tool to use KDiff3. Install KDiff3  https://sourceforge.net/projects/kdiff3/files/ Configure Git Execute in terminal git config --add merge.tool kdiff3 git config --add mergetool.kdiff3.path /Applications/kdiff3.app/Contents/MacOS/kdiff3 git config --add mergetool.kdiff3.trustExitCode false git config --add diff.guitool kdiff3 git config --add difftool.kdiff3.path /Applications/kdiff3.app/Contents/MacOS/kdiff3 git config --add difftool.kdiff3.trustExitCode false