Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 72e5890b68e7199d92620d3bba91fa36dd259404 authored by Junio C Hamano on 07 November 2005, 02:57:40 UTC, committed by Junio C Hamano on 07 November 2005, 02:57:40 UTC 
GIT 0.99.9e
 
Signed-off-by: Junio C Hamano <junkio@cox.net>
3 parent s 87ce294 + 9027907 + d5bc7ee
Raw File
Tip revision: 72e5890b68e7199d92620d3bba91fa36dd259404 authored by Junio C Hamano on 07 November 2005, 02:57:40 UTC
GIT 0.99.9e
Tip revision: 72e5890
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