Staging
v0.5.1
swh:1:snp:c5feb7ee9221a3820c8879e85e8a18470c0b3afa
Raw File
Tip revision: f7b47b273ed2c9e9b298c4f5dd02884b46dfbced authored by Junio C Hamano on 20 May 2007, 01:18:24 UTC
GIT 1.5.1.6
Tip revision: f7b47b2
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