checkout --ours/--theirs: allow checking out one side of a conflicting merge