Skip to content

Instantly share code, notes, and snippets.

@todiadiyatmo
Created August 25, 2017 06:25
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 todiadiyatmo/7fb3af35634e34d54209513574d7570c to your computer and use it in GitHub Desktop.
Save todiadiyatmo/7fb3af35634e34d54209513574d7570c to your computer and use it in GitHub Desktop.
KDIFF Windows

git config --global mergetool.kdiff3.cmd '"C:\Program Files\KDiff3\kdiff3" $BASE $LOCAL $REMOTE -o $MERGED'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment