packv4: nth_packed_object_sha1() packv4 support
[git/packv4.git] / git-merge-ours.sh
blobc81a790aa60ea08144dd0899d1aee2ec334a1825
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 git diff-index --quiet --cached HEAD || exit 2
14 exit 0