diff options
| author | Elijah Newren <newren@gmail.com> | 2016-04-09 23:13:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-12 18:39:43 -0700 |
| commit | 3ec62ad9ffba2476e30fdf8e8717756fe62119f9 (patch) | |
| tree | 8485a8c272cb56a6b4b90ddb41e3305864323ae4 /fmt-merge-msg.h | |
| parent | a6ee883b8eb56d200c3297184d29ea488a34cf43 (diff) | |
| download | git-3ec62ad9ffba2476e30fdf8e8717756fe62119f9.tar.gz | |
merge-octopus: abort if index does not match HEADen/merge-octopus-fix
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fmt-merge-msg.h')
0 files changed, 0 insertions, 0 deletions