Last active
October 13, 2023 14:50
-
-
Save watamario15/458e09220a147ef6bb31b0c0986b2f16 to your computer and use it in GitHub Desktop.
Git configurations to use VSCode, WinMerge, and UnityYAMLMerge on WSL.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[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