Junio C Hamano 5a5c5e9565 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

2018-08-20 12:41:33 -07:00

130 KiB

Raw Blame History

View Raw