Sophie

Sophie

distrib > Mageia > 4 > x86_64 > by-pkgid > d28404d4d14ca660a93fab4499df6665 > files > 257

git-core-1.8.4.5-1.mga4.x86_64.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