[merge]
    tool = vsdiffmerge
[diff]
    tool = vsdiffmerge
[core]
    editor = "C:/Program Files (x86)/GitExtensions/GitExtensions.exe" fileeditor
autocrlf = true
[credential]
[filter "lfs"]
    clean = git-lfs clean %f
    smudge = git-lfs smudge %f
    required = true
[difftool]
    prompt = false
[difftool "vsdiffmerge"]
    cmd = "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\vsdiffmerge.exe" "$LOCAL" "$REMOTE" //t
[difftool "vsdiffmerge"]
    keepbackup = false
[mergetool]
    prompt = false
[mergetool "vsdiffmerge"]
    cmd = "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\vsdiffmerge.exe" "$REMOTE" "$LOCAL" "$BASE" "$MERGED" //m
trustexitcode = true