Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 6bf035f2780bde45682e0edf40e35a150bd83706 authored by Junio C Hamano on 18 March 2007, 21:40:35 UTC
GIT 1.5.0.5
Tip revision: 6bf035f
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.

test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2

exit 0
back to top