Git Extension
http://git-extensions-documentation.readthedocs.io/en/latest/getting_started.html
https://sourceforge.net/projects/gitextensions/
Download Kdiff3
https://www.fosshub.com/KDiff3.html
Run following commands in Git Bash here
https://stackoverflow.com/questions/33308482/git-how-configure-kdiff3-as-merge-tool-and-diff-tool
git config --global --add merge.tool kdiff3
git config --global --add mergetool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe"
git config --global --add mergetool.kdiff3.trustExitCode false
No comments:
Post a Comment