sumit4iit sumit4iit
jivko
/ gist:95418853852578678f80c4ac84b6a5d8
Created
November 27, 2018 07:00
Atom as mergetool for Git
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
| [mergetool "atom"] | |
| cmd = atom -w $MERGED | |
| trustExitCode = false | |
| [merge] | |
| tool = atom | |
| conflictstyle = diff3 | |
| [mergetool] | |
| prompt = false | |
| keepbackup = false |