diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-25 15:17:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-25 15:17:15 -0700 |
| commit | 9058b8f043f5dd287b6587373f031d79694b6024 (patch) | |
| tree | 817e9ce219da084a1a94db130c7c6eeabc3b0756 /builtin | |
| parent | edc2f715bd2d18566045ed1e8eadd808cedd2903 (diff) | |
| parent | 3ec62ad9ffba2476e30fdf8e8717756fe62119f9 (diff) | |
| download | git-9058b8f043f5dd287b6587373f031d79694b6024.tar.gz git-9058b8f043f5dd287b6587373f031d79694b6024.tar.xz | |
Merge branch 'en/merge-octopus-fix'
"merge-octopus" strategy did not ensure that the index is clean
when merge begins.
* en/merge-octopus-fix:
merge-octopus: abort if index does not match HEAD
t6044: new merge testcases for when index doesn't match HEAD
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions