Jump to content

VS Code as External 2 Way Merge Tool


K_Z
 Share

Recommended Posts

I'm trying to confirm that the following is the correct config for utilizing VS Code as the external 2 way merge tool

[mergetool "semanticmerge"]
    cmd = \"C:\\Users\\KyleZeronik\\AppData\\Local\\semanticmerge\\semanticmergetool.exe\" -s \"$REMOTE\" -d \"$LOCAL\" -b \"$BASE\" -r \"$MERGED\" -a --nolangwarn -e2mt = \"code '"#"sourcefile' '"#"destinationfile' --L1 "#"sourcesymbolic --L2 "#"destinationsymbolic -o '"#"output' \"
    trustExitCode = true

also I have working both "semanticmerge" and "vscode" as difftool(s) (I switch between the 2)

[difftool]
    prompt = false
[difftool "semanticmerge"]
    cmd = \"C:\\Users\\KyleZeronik\\AppData\\Local\\semanticmerge\\semanticmergetool.exe\" -s \"$LOCAL\" -d \"$REMOTE\" --nolangwarn
[difftool "vscode"]
    cmd = code --wait --diff $LOCAL $REMOTE

Link to comment
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now
 Share

×
×
  • Create New...