git-merge-ours: make it a builtin.