merge_tools: reorder editor_args_from_settings
#3561
This run and associated checks have been archived and are scheduled for deletion.
Learn more about checks retention