-
-
Save NamPNQ/45ac6ea84dc68b5d3a54 to your computer and use it in GitHub Desktop.
Pycharm as a default git difftool and git mergetool. Add the following to ~/.gitconfig
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 = pycharm | |
| [difftool "pycharm"] | |
| cmd = /usr/local/bin/charm diff "$LOCAL" "$REMOTE" && echo "Press enter to continue..." && read | |
| [merge] | |
| tool = pycharm | |
| keepBackup = false | |
| [mergetool "pycharm"] | |
| cmd = /usr/local/bin/charm merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment