Last active
July 6, 2019 13:58
-
-
Save teddywing/ec3b65af98ed3253f9e2 to your computer and use it in GitHub Desktop.
Uncomment “Conflicts:” section in git merge commits
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
| #!/bin/sh | |
| case "$2,$3" in | |
| merge,) | |
| /usr/bin/perl -i.bak -ne 's/^# //, s/^#\t/\t/ if /^# Conflicts/ .. /^$/; print' "$1" ;; | |
| *) ;; | |
| esac |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment