Merge branch 'pw/rebase-i-merge-segv-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 19:41:33 +0000 (12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 19:41:33 +0000 (12:41 -0700)
commit5a5c5e95653f8db61ca9d1a30159dcf5dc4a8d6a
tree5e007fc315fb147b9cd06ec40a4a0f67b2f88077
parent36fd1e843b83a1ee10178e7da19eee3dee590580
parentbc9238bb0910f6d21e021e5c3061bf2124c3a176
Merge branch 'pw/rebase-i-merge-segv-fix'

"git rebase -i", when a 'merge <branch>' insn in its todo list
fails, segfaulted, which has been (minimally) corrected.

* pw/rebase-i-merge-segv-fix:
  rebase -i: fix SIGSEGV when 'merge <branch>' fails
  t3430: add conflicting commit
sequencer.c
t/t3430-rebase-merges.sh