Added ours/theirs alias and 'patience' algorithm to global gitconfig