diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2016-08-22 13:22:41 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-08-23 13:51:47 -0700 |
| commit | cb0eded863c62a38e39da7921373fc5be29846cc (patch) | |
| tree | d3f8d23a26e74edec7159766a773ebac87fba6a2 /t/t6028-merge-up-to-date.sh | |
| parent | xdl_change_compact(): fix compaction heuristic to adjust ixo (diff) | |
| download | tgif-cb0eded863c62a38e39da7921373fc5be29846cc.tar.xz | |
xdl_change_compact(): only use heuristic if group can't be matched
If the changed group of lines can be matched to a group in the other
file, then that positioning should take precedence over the compaction
heuristic.
The old code tried the heuristic unconditionally, which cost redundant
effort and also was broken if the matching code had already shifted the
group higher than the blank line.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6028-merge-up-to-date.sh')
0 files changed, 0 insertions, 0 deletions