watamario15
watamario15
/ .gitconfig
Last active
October 13, 2023 14:50
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 |
OlderNewer