[PATCH 0/2 v4] xdiff: implement empty line chunk heuristic
- From
Stefan Beller <sbeller@google.com>
- Date
- Apr 18, 2016, 21:12 UTC
- Message-ID
- <1461013950-12503-1-git-send-email-sbeller@google.com>
> OK, so perhaps either of you two can do a final version people can > start having fun with?
Here we go. I squashed in your patch, although with a minor change:
- if ((flags & XDF_SHORTEST_LINE_HEURISTIC)) {
+ if ((flags & XDF_COMPACTION_HEURISTIC) && blank_lines) {We did not need that in the "shortest line" heuristic as we know a line with the shortest line length must exist. We do not know about empty lines though.
Thanks, Stefan
Jacob Keller (1): xdiff: add recs_match helper function
Stefan Beller (1): xdiff: implement empty line chunk heuristic
Documentation/diff-config.txt | 5 +++++ Documentation/diff-options.txt | 6 ++++++ diff.c | 11 +++++++++++ xdiff/xdiff.h | 2 ++ xdiff/xdiffi.c | 40 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 60 insertions(+), 4 deletions(-)
-- 2.8.0.26.gba39a1b.dirty