"Elijah Newren via GitGitGadget" [off-list ref] writes:
Changes since v2 (of the restarted submission):
* Numerous small improvements suggested by Johannes Altmanninger
* Avoid including conflict messages from inner merges (due to example
pointed out by Ævar).
* Added a "remerge" prefix to all the new diff headers (suggested by Junio
in a previous round, but I couldn't come up with a good name before. It
suddenly hit me that "remerge" is an obvious prefix to use, and even
helps explain what the rest of the line is for.)
That sounds sensible.