gistfile1.sh

#!/bin/bash
#
# Set up user-wide:
#
# 1) Copy this file to ~/.git_template/hooks/pre-commit
# 2) git config --global init.templatedir '~/.git_template'
# 3) New repos will initialize from template. Use 'git init' on existing repos to install manually.
#

# Conflict markers
git diff --cached --diff-filter=ACMR | awk '/\+(<<<[<]<<<|>>>[>]>>>|===[=]===$)/ { exit 1 }'
CODE=$?
if [ "$CODE" != "0" ]; then
    echo "COMMIT ABORTED: Conflict markers found." >&2
    exit $CODE
fi