add ours/theirs aliases

...as sometimes during a merge, one side is just right.