Skip to content

Instantly share code, notes, and snippets.

@mteece

mteece/gist:d16b1298b677d0f75e44

Created November 7, 2014 17:03
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save mteece/d16b1298b677d0f75e44 to your computer and use it in GitHub Desktop.
Save mteece/d16b1298b677d0f75e44 to your computer and use it in GitHub Desktop.
Download ZIP
Adding kdiff3 two Windows Git as mergetool.
Raw
gistfile1.md

Either add this to your gitconfig:

[merge]
    tool = kdiff3
[mergetool "kdiff3"]
    cmd = \"C:\\\\Program Files\\\\KDiff3\\\\kdiff3\" $BASE $LOCAL $REMOTE -o $MERGED

Or run These at the command line:

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

Now you will be able to resolve your conflicts the command line via

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