Skip to content
  • Junio C Hamano's avatar
    rerere: use "struct rerere_id" instead of "char *" for conflict ID · 1d51eced
    Junio C Hamano authored
    
    
    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
    presence of the directory does not imply the presense of a previous
    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: default avatarJunio C Hamano <gitster@pobox.com>
    1d51eced