Visual Studio Code extension for running git difftool and git mergetools to resolve merge conflict.

• I tried to use an other extention but it didn't work for me, so I created my own .
• just tested on Arch Linux.
• for running git difftools, use source control toolbox in vscode, right click on file and select "Launch Difftool for ..."
• for running git mergetool, use sorce control toolbox in vscode, beside the title menu (...), select the "Launch Mergetool" or simple open the command plate and run "Launch Mergetool"

• First install diffmerge.

• Add this configuration to your git global config :

  git config --global  diff.tool diffmerge
  git config --global difftool.diffmerge.cmd diffmerge "$LOCAL" "$REMOTE"
  git config --global merge.tool diffmerge
  git config --global mergetool.diffmerge.cmd diffmerge --merge --result="$MERGED" "$LOCAL" "$(if test -f "$BASE"; then echo "$BASE"; else echo "$LOCAL"; fi)" "$REMOTE"
  git config --global mergetool.diffmerge.trustexitcode true
  

• install the extention.

• This extention should work with other diffmerge tools.
• git configurations depends on the used tools.

Bug Reports
Repo