introduce --merge
to bring up merge editor (for #5770)
#155039
Merged
--merge
to bring up merge editor (for #5770)
#155039