Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision ca182053c7710a286d72102f4576cf32e0dafcfb authored by Junio C Hamano on 27 January 2006, 22:46:10 UTC, committed by Junio C Hamano on 27 January 2006, 22:46:10 UTC 
GIT 1.0.13
 
Signed-off-by: Junio C Hamano <junkio@cox.net>
2 parent s 3a75f67 + 1ecc18e
Raw File
Tip revision: ca182053c7710a286d72102f4576cf32e0dafcfb authored by Junio C Hamano on 27 January 2006, 22:46:10 UTC
GIT 1.0.13
Tip revision: ca18205
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