Elijah Newren <newren@xxxxxxxxx> writes: > We always want our conflict hunks to be labelled so that users can know > where each came from. The previous commit fixed the one caller in the > codebase which was not setting opt->ancestor (and thus not providing a > label for the "merge base" conflict hunk in diff3-style conflict > markers); add an assertion to prevent future codepaths from also > overlooking this requirement. Makes sense.
