Live on the diff-merge branch, not on HEAD.