A Canadastartes
johnnyasantoss
/ .gitconfig
Last active
May 13, 2024 16:58
JetBrains Rider as Default Merge and Diff tool
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 with JetBrains Rider | |
| [diff] | |
| tool = rider | |
| [difftool] | |
| prompt = false | |
| [difftool "rider"] | |
| cmd = D:\\\\Program\\ Files\\\\Jetbrains\\\\apps\\\\Rider\\\\ch-0\\\\181.4379.788\\\\bin\\\\rider64.exe diff "$LOCAL" "$REMOTE" | |
| # Merge with JetBrains Rider | |
| [merge] |