Staging
v0.5.1
swh:1:snp:c5feb7ee9221a3820c8879e85e8a18470c0b3afa
Raw File
Tip revision: 9b11d24d4156e0b2246383faad16eb8aa0caeefb authored by Junio C Hamano on 11 April 2007, 21:39:07 UTC
GIT 1.5.1.1
Tip revision: 9b11d24
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