[PATCH 0/2] rebase -i: fix SIGSEGV when 'merge <branch>' fails

From: Phillip Wood <phillip.wood@dunelm.org.uk>

As they fix a bug these patches are based on maint. Unfortunately the second patch has semantic conflicts with master

s/git_path_merge_msg()/git_path_merge_msg(the_repository)/

There are additional textual conflicts with pu/next due to some messages being marked for translation. The new message here should be marked for translation to match them.

Phillip Wood (2):
  t3430: add conflicting commit
  rebase -i: fix SIGSEGV when 'merge <branch>' fails

 sequencer.c              | 24 +++++++++++++++++++-----
 t/t3430-rebase-merges.sh | 30 +++++++++++++++++++++++-------
 2 files changed, 42 insertions(+), 12 deletions(-)