blob: 4f3d053889de4a5ba8e6e5d519c014a51220accd (
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.
test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2
exit 0
|
