git-list-conflicts.sh

#!/usr/bin/env bash
# usage:
#     git-list-conflicts.sh
#     git-list-conflicts.sh branch-name
#     git-list-conflicts.sh revison-begin..revision-end
git log --merges --pretty=tformat:%H $@ | while read COMMIT ; do
    PARENTS=$(git log -1 --pretty=tformat:%P ${COMMIT})
    git checkout ${COMMIT}~1 2>/dev/null
    git merge --no-commit $(echo ${PARENTS} | cut -f 2- -d" ") >/dev/null 2>&1
    if [ $? -ne 0 ]; then
	    echo ${COMMIT}
    fi
    git reset --hard >/dev/null
    git checkout - >/dev/null 2>&1
done