jaywick

<UserShortcuts>
    <RemoveShortcut Command="Edit.CharTranspose" Scope="Text Editor">Ctrl+T</RemoveShortcut>
    <RemoveShortcut Command="Edit.WordTranspose" Scope="Text Editor">Ctrl+Shift+T</RemoveShortcut>
    <RemoveShortcut Command="Edit.GoToDeclaration" Scope="Global">Ctrl+F12</RemoveShortcut>
    <RemoveShortcut Command="Edit.SelectCurrentWord" Scope="Text Editor">Ctrl+W</RemoveShortcut>
    <RemoveShortcut Command="Edit.NextKeyTyped" Scope="VC Accelerator Editor">Ctrl+W</RemoveShortcut>
    <RemoveShortcut Command="Edit.CompleteWord" Scope="Text Editor">Alt+Right Arrow</RemoveShortcut>
    <RemoveShortcut Command="Edit.ExpandSelection" Scope="Text Editor">Ctrl+W</RemoveShortcut>
    <RemoveShortcut Command="Edit.ContractseSelection" Scope="Text Editor">Ctrl+Shift+W</RemoveShortcut>
    <RemoveShortcut Command="Edit.GoToReference" Scope="Global">Ctrl+R</RemoveShortcut>

renaco

[merge]
  tool = meld
[mergetool "meld"]
  cmd = \"C:\\Program Files (x86)\\Meld\\Meld.exe\" "$LOCAL" "$BASE" "$REMOTE" "--output=$MERGED"  
  path = C:/Program Files (x86)/Meld/Meld.exe
  trustExitCode = false  
  keepBackup = false

[diff]
  tool = meld

shawndumas

[mergetool]
    prompt = false
    keepBackup = false
    keepTemporaries = false

[merge]
    tool = winmerge

[mergetool "winmerge"]
    name = WinMerge