Re: [PATCH 0/2 v4] xdiff: implement empty line chunk heuristic

2016-04-18 Thread Stefan Beller
On Mon, Apr 18, 2016 at 2:22 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> 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_SHORT

Re: [PATCH 0/2 v4] xdiff: implement empty line chunk heuristic

2016-04-18 Thread Junio C Hamano
Stefan Beller writes: >> 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_COMPACT

[PATCH 0/2 v4] xdiff: implement empty line chunk heuristic

2016-04-18 Thread Stefan Beller
> 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) {