https://github.com/git/git
Raw File
Tip revision: 1467b5fec376b6c43a5fa54bffd356e458a8d57c authored by Junio C Hamano on 15 August 2007, 06:52:36 UTC
GIT 1.5.3-rc5
Tip revision: 1467b5f
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.

git diff-index --quiet --cached HEAD || exit 2

exit 0
back to top