From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Thu, 16 Oct 2008 23:07:27 GMT
Subject: Re: commiting while the current version is in conflict
Message-ID: <2d460de70810161607n470e9479h8f7885040cbf5428@mail.gmail.com>
In-Reply-To: <20081016224808.GO536@genesis.frugalware.org>

On Fri, Oct 17, 2008 at 00:48, Miklos Vajna <vmiklos@frugalware.org> wrote:

> Not sure, but in general blocking conflict markers by default would be a
> bad idea IMHO, several markup language (asciidoc, for example) makes use
> of the >>>, === and such character sequences.

Doesn't git keep metadata about conflicts, as well?


Richard