| commit | 9058b8f043f5dd287b6587373f031d79694b6024 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Apr 2016 22:17:15 +0000 (25 15:17 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Apr 2016 22:17:15 +0000 (25 15:17 -0700) | ||
| tree | 817e9ce219da084a1a94db130c7c6eeabc3b0756 | treesnapshot (tar.gz zip) |
| parent | edc2f715bd2d18566045ed1e8eadd808cedd2903 | commitdiff |
| parent | 3ec62ad9ffba2476e30fdf8e8717756fe62119f9 | commitdiff |
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
"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