Add snapshot, ours, and theirs aliases