Created
May 12, 2020 08:13
-
-
Save wshihadeh/1e857142f5e64edab15b5719f2e35830 to your computer and use it in GitHub Desktop.
MergeConflicts
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
| MergeConflicts: | |
| enabled: false | |
| description: 'Check for merge conflicts' | |
| quiet: true | |
| required_executable: 'grep' | |
| flags: ['-IHn', "^<<<<<<<[ \t]"] |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment