better git-merge-to