From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Jul 2015 21:23:24 +0000 (-0700)
Subject: rerere: allow multiple variants to exist
X-Git-Tag: v2.9.0-rc0~100^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a13d13700b05442855447670d7c3313f99f5da3c?hp=a13d13700b05442855447670d7c3313f99f5da3c

rerere: allow multiple variants to exist

The shape of the conflict in a path determines the conflict ID.  The
preimage and postimage pair that was recorded for the conflict ID
previously may or may not replay well for the conflict we just saw.

Currently, we punt when the previous resolution does not cleanly
replay, but ideally we should then be able to record the currently
conflicted path by assigning a new 'variant', and then record the
resolution the user is going to make.

Introduce a mechanism to have more than one variant for a given
conflict ID; we do not actually assign any variant other than 0th
variant yet at this step.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---