Add a new branch that causes a merge conflict to `testrepo` so
that we are able to test merging in worktrees.