Use diff* with --exit-code in git-am, git-rebase and git-merge-ours
[git/git.git] / git-merge-ours.sh
1 #!/bin/sh
2 #
3 # Copyright (c) 2005 Junio C Hamano
4 #
5 # Pretend we resolved the heads, but declare our tree trumps everybody else.
6 #
7
8 # We need to exit with 2 if the index does not match our HEAD tree,
9 # because the current index is what we will be committing as the
10 # merge result.
11
12 git-diff-index --quiet --cached HEAD || exit 2
13
14 exit 0