Adds alias "theirs" for using files from "remote" when resolving merge conflicts