Add a ff-merge git alias and fix the excludesfile path