From: Eric Sunshine <sunshine@sunshineco.com>
Date: Sat, 18 Jul 2015 08:47:59 GMT
Subject: Re: [PATCH v3 17/18] rerere: use "struct rerere_id" instead of "char *" for conflict ID
Message-ID: <CAPig+cRGskV_meE4Fn0FFU-96HJx1yQuEg5zOA2g4N+3+7c4Kw@mail.gmail.com>
In-Reply-To: <1437171880-21590-18-git-send-email-gitster@pobox.com>

On Fri, Jul 17, 2015 at 6:24 PM, Junio C Hamano <gitster@pobox.com> wrote:
> This gives a thin abstraction between the conflict ID that is a hash
> value obtained by inspecting the conflicts and the name of the
> directory under $GIT_DIR/rr-cache/, in which the previous resolution
> is recorded to be replayed.  The plan is to make sure that the
> presense of the directory does not imply the presense of a previous

s/presense/presence/g

> resolution and vice-versa, and later allow us to have more than one
> pair of <preimage, postimage> for a given conflict ID.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>