Merge branch 'maint'
[git/gitweb.git] / git-merge-ours.sh
blob4f3d053889de4a5ba8e6e5d519c014a51220accd
1 #!/bin/sh
3 # Copyright (c) 2005 Junio C Hamano
5 # Pretend we resolved the heads, but declare our tree trumps everybody else.
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.
12 test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2
14 exit 0