summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
blob: c81a790aa60ea08144dd0899d1aee2ec334a1825 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
#!/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