Sophie

Sophie

distrib > Mageia > 6 > armv5tl > media > core-release > by-pkgid > fa748f0308ade6b554f66341745f9e31 > files > 595

git-core-2.13.2-1.mga6.armv5tl.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