Revision 06bf6ac4248e834a229027908d405f5e42ac96d7 authored by Junio C Hamano on 16 December 2005, 02:52:51 UTC, committed by Junio C Hamano on 16 December 2005, 02:52:51 UTC
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent ee34518
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
Computing file changes ...
