Staging
v0.5.1
v0.5.1
Revision b13ef4916ac5a25cc5897f85ba0b4c5953cff609 authored by Junio C Hamano on 15 August 2007, 22:01:20 UTC, committed by Junio C Hamano on 15 August 2007, 22:01:20 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 2ed2c22
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
Computing file changes ...
