On Fri, Jul 17, 2015 at 6:24 PM, Junio C Hamano <gits...@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 <gits...@pobox.com> -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
