Conflicted cherry-pick removes formatting in message

[Infinite Persistence]

[22.1.4 #19260]

If I have a commit whose message looks like this:

  Blah title

  ## Issue

  Blah issue description

  ## Change

  Blah change description

and I cherry-pick it and have a conflict, the resulting commit message after resolving the conflict (using "Continue") looks like this:

  Blah title

  Blah issue description

  Blah change description

It used to retain the double hashes. 

No issues if the cherry-pick didn't involve a conflict.