| commit | 0074c9110db6b8cddc9950f94f69d143379b25ed | |
| author | Jeff King <peff@peff.net> | |
| Fri, 2 Nov 2018 06:38:20 +0000 (2 02:38 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 5 Nov 2018 04:14:35 +0000 (5 13:14 +0900) | ||
| tree | f1119b2d39440b2b5c55394b837b6fab5c341561 | treesnapshot (tar.gz zip) |
| parent | 7c61e25fbf1a4a65208be1197940a383f220a1b7 | commitdiff |
combine-diff: use an xdiff hunk callback
A combined diff has to line up the hunks for all of the individual
pairwise diffs, and thus needs to know their line numbers and sizes. We
get that now by parsing the hunk header line that xdiff generates.
However, now that xdiff supports a hunk callback, we can just use the
values directly.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
A combined diff has to line up the hunks for all of the individual
pairwise diffs, and thus needs to know their line numbers and sizes. We
get that now by parsing the hunk header line that xdiff generates.
However, now that xdiff supports a hunk callback, we can just use the
values directly.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| combine-diff.c | diffblobblamehistory |