Add git edit-unmerged and add-unmerged aliases