merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries