[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.
#
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	#
	7	exit 0