Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 01aaf1f88ddc2b99162c302710339f202996f39b authored by Junio C Hamano on 13 August 2006, 01:32:31 UTC, committed by Junio C Hamano on 13 August 2006, 01:32:58 UTC 
GIT 1.4.2
2 parent s 67e31d6 + a0764cb
Raw File
Tip revision: 01aaf1f88ddc2b99162c302710339f202996f39b authored by Junio C Hamano on 13 August 2006, 01:32:31 UTC
GIT 1.4.2
Tip revision: 01aaf1f
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