This adds code to merge excerpts when you expand them and they would overlap. It is only enabled for callers who use the `set_excerpts_for_path` API for multibuffers (which is currently just project diff), as other users of multibuffer care too much about the exact excerpts that they have. Release Notes: - N/A