Junio C Hamano <gitster@xxxxxxxxx> writes: > Sergey Organov <sorganov@xxxxxxxxx> writes: > >> Add separate 'match_missing' field for diff-index to use and set it when we >> encounter "-m" option. This field won't then be cleared when another >> meaning of >> "-m" is reverted (e.g., by "--no-diff-merges"), nor it will be affected by >> future option(s) that might drive 'ignore_merges' field. >> >> Use this new field from diff-lib:do_oneway_diff() instead of reusing >> 'ignore_merges' field. >> >> Signed-off-by: Sergey Organov <sorganov@xxxxxxxxx> >> --- > > Looks good. Will queue. Thanks. Nice! Thanks a lot!
