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-configured “out-of-the-box” (kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, diffuse, opendiff, p4merge and araxis), and also allows you to specify your own. To use one of the pre-configured difftools (for example, “vimdiff”), you add the following lines to your “~/.gitconfig”:
|
1 2 3 4 5 6 7 8 9 10 11 12 |
... [merge] tool = diffmerge [mergetool "diffmerge"] cmd = sgdm --merge --result=$MERGED $LOCAL $BASE $REMOTE trustExitCode = true [mergetool] keepBackup = false [diff][/diff] tool = diffmerge [difftool "diffmerge"] cmd = sgdm $LOCAL $REMOTE |