From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 18 Jul 2009 19:51:03 GMT
Subject: Re: [StGit PATCH] t2800: Adapt to changes in git's conflict markers
Message-ID: <7v7hy53h3s.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20090715095312.1705.13477.stgit@october.e.vtech>

Karl Wiberg <kha@treskal.com> writes:

> From: Karl Wiberg <kha@treskal.com>
>
> 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>

Thanks; Cc'ed Martin Renold <martinxyz@gmx.ch>.