DiffMerge merging tool: Installation and configuration for DiffMerge using GIT 1- Download and install your version from: https://sourcegear.com/diffmerge/ 2- run these commands on the terminal
|
1 2 3 4 5 6 7 8 9 10 11 |
git config --global merge.tool diffmerge git config --global mergetool.diffmerge.cmd "sgdm --merge --result=\$MERGED \$LOCAL \$BASE \$REMOTE" git config --global mergetool.diffmerge.trustExitCode true git config --global mergetool.keepBackup false git config --global diff.tool diffmerge git config --global difftool.diffmerge.cmd "sgdm \$LOCAL \$REMOTE" |
Usage
|
1 |
git mergetool |
Handle just with the: “~/.gitconfig” Git offers a range of difftools pre-configuredRead more…
