I just glanced through this file, because it seems similar to the versions I have previously reviewed. I'll skip patches 23 onwards in this round of review because (i) I would be happy if just patches 1-22 were included in the tree and (ii) those patches might end up changing anyway because of review comments in the prior patches. On Mon, 19 Jun 2017 19:48:12 -0700 Stefan Beller <sbeller@xxxxxxxxxx> wrote: > +/* Find blocks of moved code, delegate actual coloring decision to helper */ > +static void mark_color_as_moved(struct diff_options *o, > + struct hashmap *add_lines, > + struct hashmap *del_lines) > +{ [snip] > + if (flipped_block) > + l->flags |= DIFF_SYMBOL_MOVED_LINE_ZEBRA; This should probably be DIFF_SYMBOL_MOVED_LINE_ALT. "Zebra" refers to both the stripes, not just the alternate stripe.