Skip to content

Instantly share code, notes, and snippets.

@watamario15
Last active October 13, 2023 14:50
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save watamario15/458e09220a147ef6bb31b0c0986b2f16 to your computer and use it in GitHub Desktop.
Save watamario15/458e09220a147ef6bb31b0c0986b2f16 to your computer and use it in GitHub Desktop.
Git configurations to use VSCode, WinMerge, and UnityYAMLMerge on WSL.
[diff]
tool = vscode
[difftool]
prompt = false
[difftool "vscode"]
cmd = code --wait --diff "$LOCAL" "$REMOTE"
trustExitCode = false
[difftool "winmerge"]
cmd = '/mnt/c/Users/watamario15/AppData/Local/Programs/WinMerge/WinMergeU.exe' -e -r -u -x -wl -wr -dl "Your $MERGED" -dr "Incoming $MERGED" "$LOCAL" "$REMOTE"
trustExitCode = false
[merge]
tool = vscode
[mergetool]
prompt = false
keepBackup = false
[mergetool "vscode"]
cmd = code --wait --merge "$REMOTE" "$LOCAL" "$BASE" "$MERGED"
trustExitCode = false
[mergetool "winmerge"]
cmd = '/mnt/c/Users/watamario15/AppData/Local/Programs/WinMerge/WinMergeU.exe' "$MERGED"
trustExitCode = false
[mergetool "unity"]
cmd = '/mnt/c/Program Files/Unity/Hub/Editor/2019.4.39f1/Editor/Data/Tools/UnityYAMLMerge.exe' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
trustExitCode = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment