Detect unresolved merge conflict markers using a Git pre-commit hook

pre-commit

#!/bin/sh
#
# Add this to your .git/hooks/pre-commit file to detect unresolved merge conflict markers 
#

CHECK=$(git diff --staged --check)

if [ ! -z "$CHECK" ]
then
        echo "$(tput setab 1) WARNING $(tput sgr0) Conflict markers still present"
        echo "-------------------------------------------------"
        echo "$CHECK"
        exit 1
fi