| commit | bb2c9262a5eff9e4d6ddca23f6e0787afbd7b091 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Nov 2017 03:04:52 +0000 (15 12:04 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Nov 2017 03:04:52 +0000 (15 12:04 +0900) | ||
| tree | 28cff0d13641cf2f64193b73a9d71f6eb31ba814 | treesnapshot (tar.gz zip) |
| parent | fd506238f0f067e5bc2d310882007132364f76f2 | commitdiff |
| parent | 01be97c2b285e8ba377ba58385ef6ad2e7815c93 | commitdiff |
Merge branch 'sb/diff-color-moved-use-xdl-recmatch' into maint
Instead of using custom line comparison and hashing functions to
implement "moved lines" coloring in the diff output, use the pair
of these functions from lower-layer xdiff/ code.
* sb/diff-color-moved-use-xdl-recmatch:
diff.c: get rid of duplicate implementation
xdiff-interface: export comparing and hashing strings
Instead of using custom line comparison and hashing functions to
implement "moved lines" coloring in the diff output, use the pair
of these functions from lower-layer xdiff/ code.
* sb/diff-color-moved-use-xdl-recmatch:
diff.c: get rid of duplicate implementation
xdiff-interface: export comparing and hashing strings