From: Junio C Hamano Date: Mon, 6 Nov 2017 04:11:24 +0000 (+0900) Subject: Merge branch 'sb/diff-color-moved-use-xdl-recmatch' X-Git-Tag: v2.16.0-rc0~179 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61ea1fe363663a7788e00185bb5c06d8dc2371f4;p=thirdparty%2Fgit.git Merge branch 'sb/diff-color-moved-use-xdl-recmatch' 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 --- 61ea1fe363663a7788e00185bb5c06d8dc2371f4