Add git "ours" and "theirs" aliases

From http://durdn.com/blog/2012/11/22/must-have-git-aliases-advanced-examples/