Junio C Hamano 82fd285e46 Merge branch 'en/sequencer-edit-upon-conflict-fix'
"git cherry-pick/revert" with or without "--[no-]edit" did not spawn
the editor as expected (e.g. "revert --no-edit" after a conflict
still asked to edit the message), which has been corrected.

* en/sequencer-edit-upon-conflict-fix:
  sequencer: fix edit handling for cherry-pick and revert messages
2021-04-08 13:23:26 -07:00
..
2021-01-06 15:10:49 -08:00
2020-07-30 19:18:06 -07:00
2021-02-25 16:43:29 -08:00
2021-02-05 16:40:45 -08:00
2020-08-11 18:04:11 -07:00
2021-03-13 16:00:09 -08:00
2021-04-08 13:23:25 -07:00
2021-01-06 15:10:49 -08:00
2021-04-07 16:54:08 -07:00
2020-10-16 12:30:45 -07:00
2021-02-25 16:43:30 -08:00
2021-02-25 16:43:30 -08:00
2021-02-25 16:43:30 -08:00
2021-02-25 16:43:30 -08:00
2021-01-06 15:10:49 -08:00
2021-03-13 16:00:09 -08:00
2021-02-17 17:21:40 -08:00
2021-03-22 14:00:23 -07:00
2021-04-07 16:54:08 -07:00
2021-04-07 16:54:08 -07:00
2021-03-13 16:00:09 -08:00
2021-03-13 16:00:09 -08:00
2021-03-13 16:00:09 -08:00
2020-05-13 12:19:18 -07:00
2021-02-25 16:43:33 -08:00
2021-03-19 15:25:38 -07:00
2021-04-07 16:54:08 -07:00
2021-04-08 13:23:25 -07:00
2020-07-30 19:18:06 -07:00
2021-01-25 14:19:19 -08:00
2021-02-25 16:43:32 -08:00
2020-07-30 19:18:06 -07:00
2020-08-11 18:04:11 -07:00
2021-03-14 15:57:59 -07:00