Sophie

Sophie

distrib > Fedora > 18 > i386 > by-pkgid > 58abdd6cd89d53a2abdedf2832447349 > files > 449

git-1.8.1.4-2.fc18.i686.rpm

#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
# Pretend we resolved the heads, but declare our tree trumps everybody else.
#

# We need to exit with 2 if the index does not match our HEAD tree,
# because the current index is what we will be committing as the
# merge result.

git diff-index --quiet --cached HEAD -- || exit 2

exit 0