Re: [StGit PATCH] t2800: Adapt to changes in git's conflict markers

Karl Wiberg [off-list ref] writes:

From: Karl Wiberg <redacted>

The conflict markers used by git were changed slightly by commit
606475f3 ("Remove filename from conflict markers"); specifically, the
conflict markers contain the filename only when the filename has
changed.

This patch adapts t2800 to allow either the new or the old format.

Signed-off-by: Karl Wiberg <redacted>

Thanks; Cc'ed Martin Renold [off-list ref].