From: Eric Sunshine <sunshine@sunshineco.com>
Date: Mon, 19 Aug 2013 01:59:24 GMT
Subject: Re: [PATCH v3 16/24] read-cache: read resolve-undo data
Message-ID: <CAPig+cSZDGfNh0-jJeozrQhVHEZ924EeJtXXezPbhxiTZN+xaw@mail.gmail.com>
In-Reply-To: <1376854933-31241-17-git-send-email-t.gummerer@gmail.com>

On Sun, Aug 18, 2013 at 3:42 PM, Thomas Gummerer <t.gummerer@gmail.com> wrote:
> Make git read the resolve-undo data from the index.
>
> Since the resolve-undo data is joined with the conflicts in
> the ondisk format of the index file version 5, conflicts and
> resolved data is read at the same time, and the resolve-undo

s/is/are/

> data is then converted to the in-memory format.
>
> Helped-by: Thomas Rast <trast@student.ethz.ch>
> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>