diff options
Diffstat (limited to 'git-merge-ours.sh')
| -rwxr-xr-x | git-merge-ours.sh | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/git-merge-ours.sh b/git-merge-ours.sh deleted file mode 100755 index c81a790aa6..0000000000 --- a/git-merge-ours.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/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 |