[thirdparty/git.git] / git-merge-ours.sh

#!/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.

test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2

exit 0
Commit	Line	Data
64da9e60 JH	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2005 Junio C Hamano
	4	#
	5	# Pretend we resolved the heads, but declare our tree trumps everybody else.
	6	#
160252f8 JH	7
	8	# We need to exit with 2 if the index does not match our HEAD tree,
	9	# because the current index is what we will be committing as the
	10	# merge result.
	11
	12	test "$(git-diff-index --cached --name-status HEAD)" = "" \|\| exit 2
	13
64da9e60	14	exit 0