2005-11-02 04:34:49 +01:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
#
|
|
|
|
# Pretend we resolved the heads, but declare our tree trumps everybody else.
|
|
|
|
#
|
2005-11-03 10:51:25 +01:00
|
|
|
|
|
|
|
# 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.
|
|
|
|
|
2007-07-03 07:52:14 +02:00
|
|
|
git diff-index --quiet --cached HEAD || exit 2
|
2005-11-03 10:51:25 +01:00
|
|
|
|
2005-11-02 04:34:49 +01:00
|
|
|
exit 0
|