| Junio C Hamano | 64da9e6 | 2005-11-01 19:34:49 -0800 | [diff] [blame] | 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 | # |
| Junio C Hamano | 160252f | 2005-11-03 01:51:25 -0800 | [diff] [blame] | 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 | |
| Alex Riesen | 06aff47 | 2007-03-25 01:56:13 +0100 | [diff] [blame] | 12 | git-diff-index --quiet --cached HEAD || exit 2 |
| Junio C Hamano | 160252f | 2005-11-03 01:51:25 -0800 | [diff] [blame] | 13 | |
| Junio C Hamano | 64da9e6 | 2005-11-01 19:34:49 -0800 | [diff] [blame] | 14 | exit 0 |
