diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/examples/git-merge-ours.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-merge-ours.sh b/contrib/examples/git-merge-ours.sh index c81a790aa6..29dba4ba3a 100755 --- a/contrib/examples/git-merge-ours.sh +++ b/contrib/examples/git-merge-ours.sh @@ -9,6 +9,6 @@ # because the current index is what we will be committing as the # merge result. -git diff-index --quiet --cached HEAD || exit 2 +git diff-index --quiet --cached HEAD -- || exit 2 exit 0 |