Nguyễn Thái Ngọc Duy <pclo...@gmail.com> writes: > --- > apply.c | 9 ++++++--- > builtin/checkout.c | 3 ++- > diff.c | 2 +- > ll-merge.c | 17 +++++++++-------- > ll-merge.h | 5 ++++- > merge-blobs.c | 3 ++- > merge-recursive.c | 3 ++- > notes-merge.c | 3 ++- > rerere.c | 10 ++++++---- > 9 files changed, 34 insertions(+), 21 deletions(-)
This one looks good to me. The only reason why low-level merge needs to care about the index is the renormalization, and the updated code seems to correctly carry around the istate in question.
