Skip to content

Instantly share code, notes, and snippets.

@cenkc

cenkc/git-mergetool-config.txt

Last active February 25, 2020 13:17
Show Gist options
  • Save cenkc/f10899c208e879cc83e85cd37e617c43 to your computer and use it in GitHub Desktop.
Save cenkc/f10899c208e879cc83e85cd37e617c43 to your computer and use it in GitHub Desktop.
Download ZIP
git diff & merge tool config
Raw
git-mergetool-config.txt
-- Set path for diff & merge tool.
git config --global difftool.winmerge.path 'D:\devEnv\WinMerge-2.16.6\WinMergeU.exe'
git config --global mergetool.winmerge.path 'D:\devEnv\WinMerge-2.16.6\WinMergeU.exe'
-- you may want to add another tool with :
-- git config --global difftool.kdiff3.path 'PATH_TO_KDIFF_EXE'
-- git config --global mergetool.kdiff3.path 'PATH_TO_KDIFF_EXE'
-- Set default diff & merge tool.
git config --global diff.tool winmerge
git config --global merge.tool winmerge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment