From: Karl Wiberg <kha@treskal.com>
Date: Wed, 15 Jul 2009 09:25:53 +0000 (+0200)
Subject: t2800: Adapt to changes in git's conflict markers
X-Git-Tag: v0.15-rc2~19^2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/533d85c2f663a7e89816b23c627a118866ab00fb?hp=533d85c2f663a7e89816b23c627a118866ab00fb

t2800: Adapt to changes in git's conflict markers

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 <kha@treskal.com>
---