tree 751cf5f7235e9a2eb10521a3224178500b01472a
parent d1114d87c73c78a936975bef5f15e2cde639336d
parent fa5ba2c1dd0ce1bd060f423e7b1eb39d06fcd2cd
author Junio C Hamano <gitster@pobox.com> 1508214559 +0900
committer Junio C Hamano <gitster@pobox.com> 1508214559 +0900

Merge branch 'sb/diff-color-move'

A recently added "--color-moved" feature of "diff" fell into
infinite loop when ignoring whitespace changes, which has been
fixed.

* sb/diff-color-move:
  diff: fix infinite loop with --color-moved --ignore-space-change