magit-file-relative-name: bugfix
magit-merge-popup: change action order