Sample .gitconfig file, setup with mergetool kdiff3

.gitconfig

[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        # below is for SSH
        url = git@github.com:<YOUR_GITHUB_USERNAME>/<YOUR_REPO_NAME>.git
        fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
        remote = origin
        merge = refs/heads/master

[diff]
    tool = kdiff3
[difftool]
    #prompt = false
    trustExitCode = false
[difftool "kdiff3"]
    #cmd = kdiff3 "$LOCAL" "$REMOTE"
    trustExitCode = false

[merge]
    tool = kdiff3
[mergetool "kdiff3"]
    # Choose one of these 2 lines (not both!) explained below.
    #cmd = kdiff3 "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
    #cmd = kdiff3 "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
    trustExitCode = false