AndrewSoltes
This file contains hidden or 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
| { | |
| "color_scheme": "Packages/Color Scheme - Default/Monokai.tmTheme", | |
| "font_size": 13.0, | |
| "save_on_focus_lost": true, | |
| "word_wrap": true | |
| } |
This file contains hidden or 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
| git config --global merge.tool kdiff3 | |
| git config --global mergetool.keepBackup false | |
| #on windows | |
| git config --global mergetool.kdiff3.path 'G:\win\KDiff3\kdiff3.exe' | |
| #remove backups option in kdiff3 settings |