From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jul 2018 19:20:29 +0000 (-0700)
Subject: Merge branch 'pw/rebase-i-keep-reword-after-conflict'
X-Git-Tag: v2.19.0-rc0~162
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d349e188abb88879f4c2cae9f089509b25606928?hp=--cc

Merge branch 'pw/rebase-i-keep-reword-after-conflict'

Bugfix for "rebase -i" corner case regression.

* pw/rebase-i-keep-reword-after-conflict:
sequencer: do not squash 'reword' commits when we hit conflicts
---

d349e188abb88879f4c2cae9f089509b25606928