Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 4c1611249432733818e724fe04a3e9b04848cdab authored by Junio C Hamano on 01 May 2007, 00:30:02 UTC
GIT v1.5.2-rc1
Tip revision: 4c16112
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