Skip to content

Instantly share code, notes, and snippets.

@leolanese

leolanese/gist:da20c39d9c8962fbf52e

Created July 8, 2014 11:19
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save leolanese/da20c39d9c8962fbf52e to your computer and use it in GitHub Desktop.
Save leolanese/da20c39d9c8962fbf52e to your computer and use it in GitHub Desktop.
Download ZIP
DiffMerge merging tool: Installation and configuration for GIT
Raw
gistfile1.txt
// Download and install your version from: https://sourcegear.com/diffmerge/
// run these commands on the terminal
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"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment