Skip to content
Search Gists
Search Gists
All gists
Back to GitHub
Sign in
Sign up
Sign in
Sign up
You signed in with another tab or window.
Reload
to refresh your session.
You signed out in another tab or window.
Reload
to refresh your session.
You switched accounts on another tab or window.
Reload
to refresh your session.
Dismiss alert
{{ message }}
Instantly share code, notes, and snippets.
maxmarkus
/
pre-commit-hook-merge-conflicts.sh
Created
March 24, 2016 13:26
Show Gist options
Download ZIP
Star
11
(
11
)
You must be signed in to star a gist
Fork
2
(
2
)
You must be signed in to fork a gist
Embed
Select an option
Embed
Embed this gist in your website.
Share
Copy sharable link for this gist.
Clone via HTTPS
Clone using the web URL.
No results found
Clone this repository at <script src="https://gist.github.com/maxmarkus/8a81edd58dd65a45731f.js"></script>
Save maxmarkus/8a81edd58dd65a45731f to your computer and use it in GitHub Desktop.
Code
Revisions
2
Stars
11
Forks
2
Embed
Select an option
Embed
Embed this gist in your website.
Share
Copy sharable link for this gist.
Clone via HTTPS
Clone using the web URL.
No results found
Clone this repository at <script src="https://gist.github.com/maxmarkus/8a81edd58dd65a45731f.js"></script>
Save maxmarkus/8a81edd58dd65a45731f to your computer and use it in GitHub Desktop.
Download ZIP
Forks
All
2
thattomperson
(Thomas Albrighton)
Modified
View fork
MakowskiHubert
(Hua)
View fork
You can’t perform that action at this time.
