magit-merge-popup: change action order