summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-25 22:17:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-25 22:17:15 (GMT)
commit9058b8f043f5dd287b6587373f031d79694b6024 (patch)
tree817e9ce219da084a1a94db130c7c6eeabc3b0756 /builtin/merge.c
parentedc2f715bd2d18566045ed1e8eadd808cedd2903 (diff)
parent3ec62ad9ffba2476e30fdf8e8717756fe62119f9 (diff)
downloadgit-9058b8f043f5dd287b6587373f031d79694b6024.zip
git-9058b8f043f5dd287b6587373f031d79694b6024.tar.gz
git-9058b8f043f5dd287b6587373f031d79694b6024.tar.bz2
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/merge.c')
0 files changed, 0 insertions, 0 deletions