Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 1cc202bd4ebd0390d738f0d633d42791cb79dd05 authored by Junio C Hamano on 09 May 2007, 05:10:56 UTC
GIT v1.5.1.4
Tip revision: 1cc202b
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