Skip to content

Instantly share code, notes, and snippets.

@HankAviator
Last active July 8, 2022 09:27
Show Gist options
  • Save HankAviator/7ba9311aaf25e0f32877a38ba7a5264b to your computer and use it in GitHub Desktop.
Save HankAviator/7ba9311aaf25e0f32877a38ba7a5264b to your computer and use it in GitHub Desktop.
Use meld with wsl2
[alias]
dt = difftool
mt = mergetool
[diff]
tool = vscode
[difftool]
prompt = false
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[merge]
tool = meld
[mergetool "meld"]
cmd = \"c:\\\\Program Files (x86)\\\\Meld\\\\Meld.exe\" --auto-merge $LOCAL $BASE $REMOTE --output $MERGED --label=Local --label=Base --label=Remote --diff $BASE $LOCAL --diff $BASE $REMOTE
prompt = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment