| commit | 91ccfb85176fbe2ed416751ff7884cdaf61311cb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Oct 2017 04:29:19 +0000 (17 13:29 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Oct 2017 04:29:19 +0000 (17 13:29 +0900) | ||
| tree | 751cf5f7235e9a2eb10521a3224178500b01472a | treesnapshot (tar.gz zip) |
| parent | d1114d87c73c78a936975bef5f15e2cde639336d | commitdiff |
| parent | fa5ba2c1dd0ce1bd060f423e7b1eb39d06fcd2cd | commitdiff |
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
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
| diff.c | diff1 | diff2 | blobhistory |
| t/t4015-diff-whitespace.sh | diff1 | diff2 | blobhistory |