smmcdonald/gist:64e041c7112d78db727f0be469a5ac38

Created July 27, 2016 20:45

Star (0) You must be signed in to star a gist
Fork (0) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/smmcdonald/64e041c7112d78db727f0be469a5ac38.js"></script>
Save smmcdonald/64e041c7112d78db727f0be469a5ac38 to your computer and use it in GitHub Desktop.

Download ZIP

Regex for finding Git merge conflicts in Sublime 2

Raw

gistfile1.txt

(?s)(<<<<<<< HEAD)(.*?)(\=\=\=\=\=\=\=)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment